diff options
| author | Jonathan Bauer | 2013-06-20 14:56:42 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2013-06-20 14:56:42 +0200 |
| commit | 90262071f859d5c7cd5fe9fa11789f8e2773ad7c (patch) | |
| tree | 0a6a133dd7b29516a6b876a4ba43fe5773a635fd | |
| parent | [pam] only try to mount for users whose guid is > 1000 (diff) | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-90262071f859d5c7cd5fe9fa11789f8e2773ad7c.tar.gz tm-scripts-90262071f859d5c7cd5fe9fa11789f8e2773ad7c.tar.xz tm-scripts-90262071f859d5c7cd5fe9fa11789f8e2773ad7c.zip | |
Merge branch 'master' of git:openslx-ng/tm-scripts
| -rwxr-xr-x | remote/rootfs/rootfs-stage32/data/opt/openslx/bin/dhcp++ | 2 | ||||
| -rwxr-xr-x | remote/rootfs/rootfs-stage32/data/opt/openslx/bin/udhcpc.openslx.script | 18 |
2 files changed, 17 insertions, 3 deletions
diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/dhcp++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/dhcp++ index bda8e7e2..a0a03497 100755 --- a/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/dhcp++ +++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/dhcp++ @@ -8,5 +8,5 @@ NET_IP="$(ip addr show dev "${NET_IF}" | grep "inet " | awk -F " " '{print $2}' UDHCPC_OPTS="" [ ! -z "$NET_IP" ] && UDHCPC_OPTS=" -r '$NET_IP' " echo "udhcp++: running on $NET_IF with additional params $UDHCPC_OPTS" >> "/tmp/udhcpclog" -/opt/openslx/sbin/udhcpc $UDHCPC_OPTS -O domain -O nissrv -O nisdomain -O wpad -t 8 -s /opt/openslx/bin/udhcpc.openslx.script -i "$NET_IF" +/opt/openslx/sbin/udhcpc -f -p /var/run/udhcpc.pid $UDHCPC_OPTS -O domain -O nissrv -O nisdomain -O wpad -t 8 -s /opt/openslx/bin/udhcpc.openslx.script -i "$NET_IF" diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/udhcpc.openslx.script b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/udhcpc.openslx.script index 1cfd3036..ab0f0d48 100755 --- a/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/udhcpc.openslx.script +++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/udhcpc.openslx.script @@ -69,12 +69,26 @@ search lp.ruf.uni-freiburg.de # Write to openslx-config echo "# Config written by openslx-dhcp-script" >> /opt/openslx/config echo "SLX_DNS='$dns'" >> /opt/openslx/config - echo "SLX_HOSTNAME='$(hostname)'" >> /opt/openslx/config + echo "SLX_HOSTNAME='$hostname'" >> /opt/openslx/config + #update ip + sed -i "s/^\(SLX_PXE_CLIENT_IP=\).*$/\1'$ip'/" /opt/openslx/config + + #update hostname + if [ -n "$hostname" ]; then + echo "$hostname" > /proc/sys/kernel/hostname + echo "$hostname" > /etc/hostname + fi ;; deconfig) - + if [ $(grep -c "nfs=" /proc/cmdline) == 0 ]; then + echo 1 > /proc/sys/net/ipv4/conf/$interface/promote_secondaries + clientip=${ip%%:*} + ip addr del $clientip/$(ipcalc -s -p $clientip $subnet|sed s/.*=//) dev $interface + else + echo "NFS is active, not removing old ip adress. warning: lease may expire after a while." + fi ;; leasefail) |