diff options
| author | mtm <mtm@FreeBSD.org> | 2007-05-18 12:04:41 +0000 |
|---|---|---|
| committer | mtm <mtm@FreeBSD.org> | 2007-05-18 12:04:41 +0000 |
| commit | 6d5baaa0915889111c959912b06a8315052876c5 (patch) | |
| tree | 6358eeee7fccccd9b0299bd803dcf2ec18d52606 /etc/rc.d/ipsec | |
| parent | e1996cb9609d2e55a26ee78dddbfce4ba4073b53 (diff) | |
| download | FreeBSD-src-6d5baaa0915889111c959912b06a8315052876c5.zip FreeBSD-src-6d5baaa0915889111c959912b06a8315052876c5.tar.gz | |
o Implement the stop_boot subroutine [1]. This subroutine can be used by
scripts in rc.d to stop rc(8) from booting into multi-user mode when
a critical or severe error condition is encountered.
o Modify scripts in etc/rc.d that already implemented this functionality
independently.
o Document it.
[1] - This subroutine was implemented in FreeBSD in rc.d/fsck. I moved it
to rc.subr(8). Our version differs slightly in that it takes an
optional argument to stop the boot even if "autoboot" is not set.
Obtained from: NetBSD
MFC after: 2 weeks
Diffstat (limited to 'etc/rc.d/ipsec')
| -rwxr-xr-x | etc/rc.d/ipsec | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/etc/rc.d/ipsec b/etc/rc.d/ipsec index 67b7e28..223c204 100755 --- a/etc/rc.d/ipsec +++ b/etc/rc.d/ipsec @@ -26,15 +26,7 @@ ipsec_prestart() { if [ ! -f "$ipsec_file" ]; then warn "$ipsec_file not readable; ipsec start aborted." - # - # If booting directly to multiuser, send SIGTERM to - # the parent (/etc/rc) to abort the boot - # - if [ "$autoboot" = yes ]; then - echo "ERROR: ABORTING BOOT (sending SIGTERM to parent)!" - kill -TERM $$ - exit 1 - fi + stop_boot return 1 fi return 0 |
