diff options
| author | Jonathan Bauer | 2013-05-07 19:33:11 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2013-05-07 19:33:11 +0200 |
| commit | 6bf5335415273aaef78ed0a5782fde72ab646f62 (patch) | |
| tree | f432fefc26d33033c28043790f8840df1947597a /remote/rootfs | |
| parent | added '-openslx' suffix to kernel version to distinguish it from regular vers... (diff) | |
| download | tm-scripts-6bf5335415273aaef78ed0a5782fde72ab646f62.tar.gz tm-scripts-6bf5335415273aaef78ed0a5782fde72ab646f62.tar.xz tm-scripts-6bf5335415273aaef78ed0a5782fde72ab646f62.zip | |
dhcp service now requests same IP if he got one previously
Diffstat (limited to 'remote/rootfs')
| -rwxr-xr-x | remote/rootfs/rootfs-stage31/data/init | 2 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage32/data/opt/openslx/bin/dhcp++ | 13 | ||||
| -rwxr-xr-x | remote/rootfs/rootfs-stage32/data/opt/openslx/bin/mountexport (renamed from remote/rootfs/rootfs-stage32/data/usr/sbin/mountexport) | 0 |
3 files changed, 14 insertions, 1 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init index 81b045b5..2e679dad 100755 --- a/remote/rootfs/rootfs-stage31/data/init +++ b/remote/rootfs/rootfs-stage31/data/init @@ -130,7 +130,7 @@ mkdir -p /mnt/uniontmp /mnt/tmp mount -n --move /dev/shm/uniontmp /mnt/uniontmp # create udev rule for nic we booted from -[ -e "/mnt/etc/udev/rules.d/70-net-boot-nic-name.rules" ] && echo 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="'$macaddr'", ATTR{dev_id}=="0x0", ATTR{type}=="1", KERNEL=="eth*", NAME="eth0"' > "/mnt/etc/udev/rules.d/70-net-boot-nic-name.rules" +echo 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="'$macaddr'", ATTR{dev_id}=="0x0", ATTR{type}=="1", KERNEL=="eth*", NAME="eth0"' > "/mnt/etc/udev/rules.d/70-net-boot-nic-name.rules" for mnt in proc sys run ; do umount -n $mnt diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/dhcp++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/dhcp++ new file mode 100644 index 00000000..f3d1f76a --- /dev/null +++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/dhcp++ @@ -0,0 +1,13 @@ +#!/bin/bash + +export PATH=$PATH:/opt/openslx/bin:/opt/openslx/sbin:/opt/openslx/usr/bin:/opt/openslx/usr/sbin + +NET_IF=$1 +NET_IP=$(ip addr show dev ${NET_IF} | grep "inet " | awk -F " " '{print $2}' | awk -F "/" '{print $1}') + +echo "NET_IP: $NET_IP" >> /root/foo +echo "NET_IF: $NET_IF" >> /root/foo + +UDHCPC_OPTS="" +[ ! -z "$NET_IP" ] && UDHCPC_OPTS=" -r $NET_IP " +/opt/openslx/sbin/udhcpc $UDHCPC_OPTS -O domain -O nissrv -O nisdomain -O wpad -t 8 -s /etc/udhcpc.openslx.script -i $NET_IF diff --git a/remote/rootfs/rootfs-stage32/data/usr/sbin/mountexport b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/mountexport index cc08728e..cc08728e 100755 --- a/remote/rootfs/rootfs-stage32/data/usr/sbin/mountexport +++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/mountexport |