diff options
| author | Roy Marples <roy@marples.name> | 2007-12-14 14:19:03 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2007-12-14 14:19:03 +0000 |
| commit | a010d0bb69fbdda086c265d7cab650c485c3e6f3 (patch) | |
| tree | a86dded9b78681751f20d5067586ed60791183ea /sh.BSD | |
| parent | 9f2403dffae514dca431828014a2dc9c9de4e61f (diff) | |
| download | openrc-a010d0bb69fbdda086c265d7cab650c485c3e6f3.tar.gz openrc-a010d0bb69fbdda086c265d7cab650c485c3e6f3.tar.bz2 openrc-a010d0bb69fbdda086c265d7cab650c485c3e6f3.tar.xz | |
Remove the try and check_statedir functions
Diffstat (limited to 'sh.BSD')
| -rwxr-xr-x | sh.BSD/init.sh | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sh.BSD/init.sh b/sh.BSD/init.sh index 2133fce..98e265b 100755 --- a/sh.BSD/init.sh +++ b/sh.BSD/init.sh @@ -42,28 +42,27 @@ mount_svcdir() { if [ -e "${RC_SVCDIR}"/deptree ]; then dotmp=true 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 + mdconfig -a -t malloc -s 1m -u 1 + newfs /dev/md1 + 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 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}" + mdconfig -a -t malloc -s "${rc_svcsize:-1024}"k -u 0 + newfs -b 4096 -i 1024 -n /dev/md0 + 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 - ${release} && try mdconfig -d -u 1 + umount "${RC_LIBDIR}"/tmp + ${release} && mdconfig -d -u 1 fi } -. "${RC_LIBDIR}"/sh/init-functions.sh . "${RC_LIBDIR}"/sh/functions.sh [ -r /etc/rc.conf ] && . /etc/rc.conf |