diff options
| author | Christian Rößler | 2013-08-29 16:56:38 +0200 |
|---|---|---|
| committer | Christian Rößler | 2013-08-29 16:56:38 +0200 |
| commit | 7fe30cbd6b22a6264c95b5fe8c5d6603fd57c08b (patch) | |
| tree | e1c1960379ec29861d25213becade6e6879b2832 | |
| parent | [busybox] Corr. options for addgroup (diff) | |
| parent | [rootfs-stage32] Added more checks to udhcpc script when deciding whether to ... (diff) | |
| download | tm-scripts-7fe30cbd6b22a6264c95b5fe8c5d6603fd57c08b.tar.gz tm-scripts-7fe30cbd6b22a6264c95b5fe8c5d6603fd57c08b.tar.xz tm-scripts-7fe30cbd6b22a6264c95b5fe8c5d6603fd57c08b.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
| -rw-r--r-- | remote/rootfs/rootfs-stage32/data/etc/systemd/system/nfs-mount.service (renamed from remote/modules/systemd/data/etc/systemd/system/nfs-mount.service) | 1 | ||||
| -rwxr-xr-x | remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/udhcpc-openslx | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/remote/modules/systemd/data/etc/systemd/system/nfs-mount.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/nfs-mount.service index d597fa4b..922656f1 100644 --- a/remote/modules/systemd/data/etc/systemd/system/nfs-mount.service +++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/nfs-mount.service @@ -1,5 +1,6 @@ [Unit] Description=Mount NFS Share [TEST] +DefaultDependencies=no [Service] Type=oneshot diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/udhcpc-openslx b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/udhcpc-openslx index fd88ca30..69380a2f 100755 --- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/udhcpc-openslx +++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/udhcpc-openslx @@ -56,8 +56,10 @@ case "$1" in printf -v CONF "${CONF}nameserver $i\n" done - if [ -x /sbin/resolvconf ]; then + if [ -x /sbin/resolvconf ] && [ -L /etc/resolv.conf ] && [ -d /etc/resolvconf/update.d ]; then # Automatic handling :-) + resolvconf --create-runtime-directories + resolvconf --enable-updates echo -n "$CONF" | resolvconf -a "${interface}.udhcpc" else # Manual handling required :-( @@ -149,7 +151,7 @@ case "$1" in echo "NFS is active, not removing old ip adress. warning: lease may expire after a while." fi - if [ -x /sbin/resolvconf ]; then + if [ -x /sbin/resolvconf ] && [ -L /etc/resolv.conf ] && [ -d /etc/resolvconf/update.d ]; then # Automatic handling :-) resolvconf -d "${interface}.udhcpc" else |