Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Remove old bit-rotted fast-boot scripts from releng/10.0

Fixes some issues starting webcamd among others
  • Loading branch information...
commit 1c0248c849d040fa232805023c524dd9a5d38f21 1 parent ef1ead7
@kmoore134 kmoore134 authored
View
1  etc/Makefile
@@ -39,7 +39,6 @@ BIN1= crontab \
rc \
rc.bsdextended \
rc.conf.pcbsd \
- rc.delay \
rc.firewall \
rc.initdiskless \
rc.sendmail \
View
74 etc/rc
@@ -116,16 +116,16 @@ if [ -e "/var/.freebsd-update-finish" ] ; then
# Enable networking first
run_rc_script /etc/rc.d/netif ${_boot}
-
+
TERM="cons25" ; export TERM
clear
-
+
/usr/local/bin/pc-updatemanager finish-major-update
rm /var/.freebsd-update-finish 2>/dev/null
sync
-
+
clear
echo "Rebooting..."
shutdown -r now
@@ -134,60 +134,28 @@ fi
# Tickle /etc/version
uname -r > /etc/version
-if [ "$fastboot_enable" = "YES" ]; then
- # We are fast-booting
-
- # List of rc.d scripts we will start before login
- preLoad="/etc/rc.d/hostname /etc/rc.d/random /etc/rc.d/adjkerntz /etc/rc.d/cleanvar /etc/rc.d/hostid /etc/rc.d/ldconfig /etc/rc.d/zfs /etc/rc.d/zvol /etc/rc.d/cleartmp $fastboot_earlyrc "
-
- # Start loopback device
- /etc/rc.d/netif start lo0
-
- # Run the early scripts now
- for i in $preLoad
- do
- run_rc_script ${i} ${_boot}
- done
-
- # Check for USB mouse to start
- mChk="ums0 ums1"
- for i in $mChk
- do
- if [ -e "/dev/$i" ] ; then
- /etc/rc.d/moused start $i
- fi
- done
-
- # Start the delayed services after the login is up
- (sleep 5; nice /bin/sh /etc/rc.delay "$_rc_elem_done$preLoad")&
-else
- # Performing a normal startup
-
- # Now that disks are mounted, for each dir in $local_startup
- # search for init scripts that use the new rc.d semantics.
- #
-
- case ${local_startup} in
- [Nn][Oo] | '') ;;
- *) find_local_scripts_new ;;
- esac
-
- files=`rcorder ${skip} ${skip_firstboot} /etc/rc.d/* ${local_rc} 2>/dev/null`
- for _rc_elem in ${files}; do
+# Now that disks are mounted, for each dir in $local_startup
+# search for init scripts that use the new rc.d semantics.
+#
+case ${local_startup} in
+[Nn][Oo] | '') ;;
+*) find_local_scripts_new ;;
+esac
- # The firstboot sentinel might be on a newly mounted filesystem; look for it
- # again and unset skip_firstboot if we find it.
- if [ -e ${firstboot_sentinel} ]; then
+# The firstboot sentinel might be on a newly mounted filesystem; look for it
+# again and unset skip_firstboot if we find it.
+if [ -e ${firstboot_sentinel} ]; then
skip_firstboot=""
- fi
+fi
- case "$_rc_elem_done" in
- *" $_rc_elem "*) continue ;;
- esac
- run_rc_script ${_rc_elem} ${_boot}
- done
+files=`rcorder ${skip} ${skip_firstboot} /etc/rc.d/* ${local_rc} 2>/dev/null`
+for _rc_elem in ${files}; do
+ case "$_rc_elem_done" in
+ *" $_rc_elem "*) continue ;;
+ esac
-fi
+ run_rc_script ${_rc_elem} ${_boot}
+done
# Remove the firstboot sentinel, and reboot if it was requested.
if [ -e ${firstboot_sentinel} ]; then
View
4 etc/rc.conf.pcbsd
@@ -142,10 +142,6 @@ if [ -e "/etc/defaults/pcbsd" ] ; then
# Enable moused
moused_enable="YES"
- # Enable fast-booting
- fastboot_enable="YES"
- fastboot_earlyrc="/etc/rc.d/netif /etc/rc.d/wpa_supplicant /etc/rc.d/devd /etc/rc.d/moused /usr/local/etc/rc.d/pefs /usr/local/etc/rc.d/dbus /usr/local/etc/rc.d/hald /usr/local/etc/rc.d/avahi-daemon /usr/local/etc/rc.d/avahi-dnsconfd /usr/local/etc/rc.d/pcdm"
-
# Enable the Warden
warden_enable="YES"
View
98 etc/rc.delay
@@ -1,98 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2000-2004 The FreeBSD Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# @(#)rc 5.27 (Berkeley) 6/5/91
-# $FreeBSD$
-#
-
-# Delayed system startup script run by /etc/rc after bootup
-# Output and error are redirected to /var/log/rc_delay.log
-
-# Note that almost all of the user-configurable behavior is no longer in
-# this file, but rather in /etc/defaults/rc.conf. Please check that file
-# first before contemplating any changes here. If you do need to change
-# this file for some reason, we would like to know about it.
-
-stty status '^T'
-
-# Set shell to ignore SIGINT (2), but not children;
-# shell catches SIGQUIT (3) and returns to single user.
-#
-trap : 2
-trap "echo 'Boot interrupted'; exit 1" 3
-
-HOME=/
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-export HOME PATH
-
-autoboot=yes
-_boot="faststart"
-rc_fast=yes # run_rc_command(): do fast booting
-_log="/var/log/rc_delay.log"
-echo "Starting delayed services `date`" > $_log
-
-dlv=`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null`
-if [ ${dlv:=0} -ne 0 -o -f /etc/diskless ]; then
- sh /etc/rc.initdiskless
-fi
-
-# Run these after determining whether we are booting diskless in order
-# to minimize the number of files that are needed on a diskless system,
-# and to make the configuration file variables available to rc itself.
-#
-. /etc/rc.subr
-load_rc_config 'XXX'
-
-skip="-s nostart"
-if [ `/sbin/sysctl -n security.jail.jailed` -eq 1 ]; then
- skip="$skip -s nojail"
- if [ "$early_late_divider" = "FILESYSTEMS" ]; then
- early_late_divider=NETWORKING
- fi
-fi
-
-unset files local_rc
-_rc_elem_done="$1"
-
-# Now that disks are mounted, for each dir in $local_startup
-# search for init scripts that use the new rc.d semantics.
-#
-case ${local_startup} in
-[Nn][Oo] | '') ;;
-*) find_local_scripts_new ;;
-esac
-
-files=`rcorder ${skip} /etc/rc.d/* ${local_rc} 2>/dev/null`
-for _rc_elem in ${files}; do
- case "$_rc_elem_done" in
- *" $_rc_elem "*) continue ;;
- esac
-
- run_rc_script ${_rc_elem} ${_boot} >>${_log}
-done
-
-echo "Finished starting delayed services `date`" >> $_log
-exit 0
View
2  sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="10.0"
-BRANCH="RELEASE"
+BRANCH="RELEASE-p1"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
Please sign in to comment.
Something went wrong with that request. Please try again.