diff options
| author | mtm <mtm@FreeBSD.org> | 2003-12-09 08:17:33 +0000 |
|---|---|---|
| committer | mtm <mtm@FreeBSD.org> | 2003-12-09 08:17:33 +0000 |
| commit | 2669c6047377fba1e6bbf1c2cf333e7c09b664f7 (patch) | |
| tree | 1048648f2edd5bac6e7e201bbb5d9f1284f427a3 /etc | |
| parent | 9cc2fb30f267309ea4e89a018053f39712ace080 (diff) | |
| download | FreeBSD-src-2669c6047377fba1e6bbf1c2cf333e7c09b664f7.zip FreeBSD-src-2669c6047377fba1e6bbf1c2cf333e7c09b664f7.tar.gz | |
If rc.d/mountcritlocal is unable to mount local filesystems,
then immediately terminate the shell (during boot this
also terminates the parent rc(8) shell). This was the pre-rcNG behaviour.
Also, remove an extraneous mount /.
PR: conf/57659
Submitted by: yar (with modifications)
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/rc.d/mountcritlocal | 2 | ||||
| -rwxr-xr-x | etc/rc.d/root | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/etc/rc.d/mountcritlocal b/etc/rc.d/mountcritlocal index 2afddd7..83acefe 100755 --- a/etc/rc.d/mountcritlocal +++ b/etc/rc.d/mountcritlocal @@ -43,7 +43,7 @@ mountcritlocal_start() *) echo 'Mounting /etc/fstab filesystems failed,' \ ' startup aborted' - exit 1 + kill -QUIT $$ ;; esac ;; diff --git a/etc/rc.d/root b/etc/rc.d/root index b521e6f..37a3cbb 100755 --- a/etc/rc.d/root +++ b/etc/rc.d/root @@ -27,13 +27,12 @@ root_start() *) if ! mount -u -o rw /; then echo 'Mounting root filesystem rw failed, startup aborted' - exit 1 + /bin/kill -QUIT $$ fi ;; esac umount -a >/dev/null 2>&1 - mount / # If we booted a special kernel remove the record # so we will boot the default kernel next time. |
