summaryrefslogtreecommitdiffstats
path: root/etc/rc.d/root
diff options
context:
space:
mode:
authormtm <mtm@FreeBSD.org>2004-01-17 10:59:43 +0000
committermtm <mtm@FreeBSD.org>2004-01-17 10:59:43 +0000
commit5da6236d0167eab4e233aaf815198eb7d1fe5898 (patch)
tree6439610462f4b5b56816a33d4ba3c60ab1fe1868 /etc/rc.d/root
parent7948e91c15e85d387bf8070d18fd9257a7d982be (diff)
downloadFreeBSD-src-5da6236d0167eab4e233aaf815198eb7d1fe5898.zip
FreeBSD-src-5da6236d0167eab4e233aaf815198eb7d1fe5898.tar.gz
Luke Mewburn has indicated that they (NetBSD) are not interested
in keeping the scripts under rc.d in sync with us. So, remove NetBSD specific stuff (which made our scripts more complicated than necessary). The NetBSD ident string will be left intact, both for history and also incase we wish to pull in future versions.
Diffstat (limited to 'etc/rc.d/root')
-rwxr-xr-xetc/rc.d/root45
1 files changed, 18 insertions, 27 deletions
diff --git a/etc/rc.d/root b/etc/rc.d/root
index e737972..90fe711 100755
--- a/etc/rc.d/root
+++ b/etc/rc.d/root
@@ -16,36 +16,27 @@ stop_cmd=":"
root_start()
{
- case ${OSTYPE} in
- FreeBSD)
- # root normally must be read/write, but if this is a BOOTP NFS
- # diskless boot it does not have to be.
- #
- case ${root_rw_mount} in
- [Nn][Oo] | '')
- ;;
- *)
- if ! mount -u -o rw /; then
- echo 'Mounting root filesystem rw failed, startup aborted'
- /bin/kill -QUIT $$
- fi
- ;;
- esac
-
- umount -a >/dev/null 2>&1
-
- # If we booted a special kernel remove the record
- # so we will boot the default kernel next time.
- if [ -e /boot/nextkernel ]; then
- rm -f /boot/nextkernel
- fi
+ # root normally must be read/write, but if this is a BOOTP NFS
+ # diskless boot it does not have to be.
+ #
+ case ${root_rw_mount} in
+ [Nn][Oo] | '')
;;
- NetBSD)
- umount -a >/dev/null 2>&1
- mount /
- rm -f /fastboot
+ *)
+ if ! mount -u -o rw /; then
+ echo 'Mounting root filesystem rw failed, startup aborted'
+ /bin/kill -QUIT $$
+ fi
;;
esac
+
+ umount -a >/dev/null 2>&1
+
+ # If we booted a special kernel remove the record
+ # so we will boot the default kernel next time.
+ if [ -e /boot/nextkernel ]; then
+ rm -f /boot/nextkernel
+ fi
}
load_rc_config $name
OpenPOWER on IntegriCloud