diff options
| author |   pieterg <pieterg@gmx.com> | 2009-01-29 19:01:51 +0100 |
|---|---|---|
| committer | pieterg <pieterg@gmx.com> | 2009-01-29 19:01:51 +0100 |
| commit | fe1302d630a19e736fc4df14175bfa7005854602 (patch) | |
| tree | 8870f5ce4804365b91bb9b30e64cc143567eaf93 /packages/initscripts | |
| parent | 4e63d335fd5801a5ea5fdd73ebe528c88af9c911 (diff) | |
| download | openembedded-fe1302d630a19e736fc4df14175bfa7005854602.tar.gz | |
umount network filesystems in if-down, instead of from runlevels 0 and 6, when the network is down already (and umount might block)
Diffstat (limited to 'packages/initscripts')
| -rwxr-xr-x | packages/initscripts/initscripts-1.0/umountnfs.sh | 3 | ||||
| -rw-r--r-- | packages/initscripts/initscripts-opendreambox_1.0.bb | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/packages/initscripts/initscripts-1.0/umountnfs.sh b/packages/initscripts/initscripts-1.0/umountnfs.sh index 600a8a48ef..f8a1741e33 100755 --- a/packages/initscripts/initscripts-1.0/umountnfs.sh +++ b/packages/initscripts/initscripts-1.0/umountnfs.sh @@ -5,9 +5,6 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin -# Write a reboot record to /var/log/wtmp before unmounting -halt -w - echo "Unmounting remote filesystems..." test -f /etc/fstab && ( diff --git a/packages/initscripts/initscripts-opendreambox_1.0.bb b/packages/initscripts/initscripts-opendreambox_1.0.bb index 1fa46f47e7..d12e2f54e6 100644 --- a/packages/initscripts/initscripts-opendreambox_1.0.bb +++ b/packages/initscripts/initscripts-opendreambox_1.0.bb @@ -5,7 +5,7 @@ PRIORITY = "required" DEPENDS = "makedevs" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r19" +PR = "r20" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" @@ -43,7 +43,6 @@ do_install () { install -m 0755 ${WORKDIR}/rmnologin ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/sendsigs ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/single ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/umountnfs.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/bootup ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/var.tar.gz.default ${D}${sysconfdir}/var.tar.gz @@ -61,6 +60,8 @@ do_install () { install -m 0755 ${WORKDIR}/umountfs ${D}${sysconfdir}/init.d/umountfs install -d ${D}${sysconfdir}/network/if-up.d install -m 0755 ${WORKDIR}/netmount.sh ${D}${sysconfdir}/network/if-up.d/02netmount + install -d ${D}${sysconfdir}/network/if-down.d + install -m 0755 ${WORKDIR}/umountnfs.sh ${D}${sysconfdir}/network/if-down.d/02umountnfs fi if [ "${MACHINE}" = "dm8000" ]; then @@ -72,11 +73,9 @@ do_install () { ln -sf ../init.d/rmnologin ${D}${sysconfdir}/rc4.d/S99rmnologin ln -sf ../init.d/rmnologin ${D}${sysconfdir}/rc5.d/S99rmnologin ln -sf ../init.d/sendsigs ${D}${sysconfdir}/rc6.d/S20sendsigs - ln -sf ../init.d/umountnfs.sh ${D}${sysconfdir}/rc6.d/S31umountnfs.sh ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc6.d/S40umountfs ln -sf ../init.d/reboot ${D}${sysconfdir}/rc6.d/S90reboot ln -sf ../init.d/sendsigs ${D}${sysconfdir}/rc0.d/S20sendsigs - ln -sf ../init.d/umountnfs.sh ${D}${sysconfdir}/rc0.d/S31umountnfs.sh ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc0.d/S40umountfs ln -sf ../init.d/halt ${D}${sysconfdir}/rc0.d/S90halt ln -sf ../init.d/bootup ${D}${sysconfdir}/rcS.d/S00bootup |