diff options
| -rwxr-xr-x | init.d/halt.sh | 4 | ||||
| -rwxr-xr-x | sh.BSD/init.sh | 22 |
2 files changed, 17 insertions, 9 deletions
diff --git a/init.d/halt.sh b/init.d/halt.sh index fb82db1c..c3f76f3b 100755 --- a/init.d/halt.sh +++ b/init.d/halt.sh @@ -58,7 +58,9 @@ if [ "${RC_SYS}" = "VPS" ]; then fi # If $svcdir is still mounted, preserve it if we can -if mountinfo -q "${RC_SVCDIR}" && [ -w "${RC_LIBDIR}" ] ; then + +mnt=$(mountinfo --node "${RC_SVCDIR}") +if [ -n "${mnt}" -a -w "${RC_LIBDIR}" ] ; then f_opts="-m -c" [ "${RC_UNAME}" = "Linux" ] && f_opts="-c" if [ -n "$(fuser ${f_opts} "${svcdir}" 2>/dev/null)" ] ; then diff --git a/sh.BSD/init.sh b/sh.BSD/init.sh index 3a9ad815..f5e4327a 100755 --- a/sh.BSD/init.sh +++ b/sh.BSD/init.sh @@ -37,24 +37,30 @@ single_user() { # FreeBSD has a nice ramdisk - we don't set a size as we should always # be fairly small and we unmount them after the boot level is done anyway # NOTE we don't set a size for Linux either +# FreeBSD-7 supports tmpfs now :) mount_svcdir() { - local dotmp=false + local dotmp=false release=false if [ -e "${RC_SVCDIR}"/deptree ] ; then dotmp=true - try mdconfig -a -t malloc -s 1m -u 1 - try newfs /dev/md1 - try mount /dev/md1 "${RC_LIBDIR}"/tmp + if ! mount -t tmpfs none "${RC_LIBDIR}"/tmp 2>/dev/null; then + try mdconfig -a -t malloc -s 1m -u 1 + try newfs /dev/md1 + try mount /dev/md1 "${RC_LIBDIR}"/tmp + release=true + fi cp -p "${RC_SVCDIR}"/deptree "${RC_SVCDIR}"/depconfig \ "${RC_SVCDIR}"/nettree "${RC_LIBDIR}"/tmp 2>/dev/null fi - try mdconfig -a -t malloc -s "${rc_svcsize:-1024}"k -u 0 - try newfs -b 4096 -i 1024 -n /dev/md0 - try mount -o rw,noexec,nosuid /dev/md0 "${RC_SVCDIR}" + if ! mount -t tmpfs -o rw,noexec,nosuid none "${RC_SVCDIR}" 2>/dev/null; then + try mdconfig -a -t malloc -s "${rc_svcsize:-1024}"k -u 0 + try newfs -b 4096 -i 1024 -n /dev/md0 + try mount -o rw,noexec,nosuid /dev/md0 "${RC_SVCDIR}" + fi if ${dotmp} ; then cp -p "${RC_LIBDIR}"/tmp/deptree "${RC_LIBDIR}"/tmp/depconfig \ "${RC_LIBDIR}"/tmp/nettree "${RC_SVCDIR}" 2>/dev/null try umount "${RC_LIBDIR}"/tmp - try mdconfig -d -u 1 + ${release} && try mdconfig -d -u 1 fi } |