Attachment #772 for bug #6274

View | Details | Raw Unified | Return to bug 6274
Collapse All | Expand All

Lines 19-30 Link Here

(-)startup-0.9.3.orig/rc.d/rc (-2 / +13 lines)
19	previous="$1"	19	previous="$1"
20	export runlevel previous	20	export runlevel previous
21		21
		22
22	# Get first argument. Set new runlevel to this argument.	23	# Get first argument. Set new runlevel to this argument.
23	[ -z "$argv1" ] \|\| runlevel="$argv1"	24	[ -z "$argv1" ] \|\| runlevel="$argv1"
24		25
		26	initsplash
		27
25	# See if we want to be in user confirmation mode	28	# See if we want to be in user confirmation mode
26	CONFIRM=	29	CONFIRM=
27	if [ "$previous" = "N" ]; then	30	if [ "$previous" = "N" ]; then
		31	rc_splash start
28	if [ -f /var/run/confirm ] \|\| grep -iwqs confirm /proc/cmdline; then	32	if [ -f /var/run/confirm ] \|\| grep -iwqs confirm /proc/cmdline; then
29	rm -f /var/run/confirm	33	rm -f /var/run/confirm
30	CONFIRM=yes	34	CONFIRM=yes
Lines 54-59 Link Here
54		58
55	subsys=${i#/etc/rc.d/rc$runlevel.d/K??}	59	subsys=${i#/etc/rc.d/rc$runlevel.d/K??}
56		60
		61	rc_splash $subsys
		62
57	# Check if the subsystem is already up.	63	# Check if the subsystem is already up.
58	[ -f "/var/lock/subsys/$subsys" -o -f "/var/lock/subsys/$subsys.init" ] \|\| continue	64	[ -f "/var/lock/subsys/$subsys" -o -f "/var/lock/subsys/$subsys.init" ] \|\| continue
59		65
Lines 65-70 Link Here
65	fi	71	fi
66	done	72	done
67		73
		74
		75
68	# Now run the START scripts.	76	# Now run the START scripts.
69	for i in "/etc/rc.d/rc$runlevel.d"/S*; do	77	for i in "/etc/rc.d/rc$runlevel.d"/S*; do
70	check_script "$i" \|\| continue	78	check_script "$i" \|\| continue
Lines 73-79 Link Here
73		81
74	# Check if the subsystem is already up.	82	# Check if the subsystem is already up.
75	[ -f "/var/lock/subsys/$subsys" -o -f "/var/lock/subsys/$subsys.init" ] && continue	83	[ -f "/var/lock/subsys/$subsys" -o -f "/var/lock/subsys/$subsys.init" ] && continue
76
77	# If we're in confirmation mode, get user confirmation	84	# If we're in confirmation mode, get user confirmation
78	if [ -n "$CONFIRM" ]; then	85	if [ -n "$CONFIRM" ]; then
79	confirm "$subsys"	86	confirm "$subsys"
Lines 83-89 Link Here
83	*) continue ;;	90	*) continue ;;
84	esac	91	esac
85	fi	92	fi
86		93	rc_splash $subsys
87	if [ "$subsys" = halt -o "$subsys" = reboot -o "$subsys" = single -o "$subsys" = local ] \	94	if [ "$subsys" = halt -o "$subsys" = reboot -o "$subsys" = single -o "$subsys" = local ] \
88	\|\| egrep -qs '(action\|daemon\|msg_) ' "$i"; then	95	\|\| egrep -qs '(action\|daemon\|msg_) ' "$i"; then
89	"$i" start	96	"$i" start
Lines 91-93 Link Here
91	action "Starting $subsys:" "$i" start	98	action "Starting $subsys:" "$i" start
92	fi	99	fi
93	done	100	done
		101
		102	if [[ "$newrunlevel" != "0" && "$newrunlevel" != "6" ]]; then
		103	rc_splash stop
		104	fi

Lines 29-34 Link Here

(-)startup-0.9.3.orig/rc.d/rc.sysinit (+14 lines)
29		29
30	HOSTNAME=`hostname`	30	HOSTNAME=`hostname`
31		31
		32
32	# Read in config data	33	# Read in config data
33	if ! SourceIfNotEmpty /etc/sysconfig/network; then	34	if ! SourceIfNotEmpty /etc/sysconfig/network; then
34	NETWORKING=no	35	NETWORKING=no
Lines 69-74 Link Here
69	PROMPT=	70	PROMPT=
70	fi	71	fi
71		72
		73
72	# Mount /proc (done here so volume labels can work with fsck)	74	# Mount /proc (done here so volume labels can work with fsck)
73	action "Mounting proc filesystem:" mount -n -t proc proc /proc	75	action "Mounting proc filesystem:" mount -n -t proc proc /proc
74	chgrp proc /proc >/dev/null 2>&1 \|\|:	76	chgrp proc /proc >/dev/null 2>&1 \|\|:
Lines 77-82 Link Here
77	if [ "`kernelversion_major`" -eq 2 ] && [ "`kernelversion_minor`" -ge 5 ]; then	79	if [ "`kernelversion_major`" -eq 2 ] && [ "`kernelversion_minor`" -ge 5 ]; then
78	action "Mounting sys filesystem:" mount -n -t sysfs sysfs /sys	80	action "Mounting sys filesystem:" mount -n -t sysfs sysfs /sys
79	fi	81	fi
		82	initsplash 5
		83
		84	rc_splash start 1
80		85
81	# Set the system clock (when /etc/adjtime is missing)	86	# Set the system clock (when /etc/adjtime is missing)
82	[ -s /etc/adjtime ] \|\| /etc/init.d/clock start	87	[ -s /etc/adjtime ] \|\| /etc/init.d/clock start
Lines 181-186 Link Here
181	fi	186	fi
182	fi	187	fi
183		188
		189	rc_splash remount 2
184	# Remount the root filesystem read-write	190	# Remount the root filesystem read-write
185	action "Remounting root filesystem in read/write mode:" mount -n -o remount,rw /	191	action "Remounting root filesystem in read/write mode:" mount -n -o remount,rw /
186		192
Lines 222-232 Link Here
222	fi	228	fi
223	fi	229	fi
224		230
		231	rc_splash depmod 3
225	# Load modules where appropriate	232	# Load modules where appropriate
226	if [ -x /sbin/depmod ] && is_yes "$USEMODULES"; then	233	if [ -x /sbin/depmod ] && is_yes "$USEMODULES"; then
227	INITLOG_ARGS= action "Finding module dependencies:" depmod -A	234	INITLOG_ARGS= action "Finding module dependencies:" depmod -A
228	fi	235	fi
229		236
		237	rc_splash kernel 4
		238
230	# Configure kernel parameters	239	# Configure kernel parameters
231	action "Configuring kernel parameters:" sysctl -e -p /etc/sysctl.conf	240	action "Configuring kernel parameters:" sysctl -e -p /etc/sysctl.conf
232		241
Lines 349-354 Link Here
349	# Check filesystems	358	# Check filesystems
350	# (pixel) do not check loopback files, will be done later (aren't available yet)	359	# (pixel) do not check loopback files, will be done later (aren't available yet)
351	if [ -z "$fastboot" ]; then	360	if [ -z "$fastboot" ]; then
		361	rc_splash localfs 5
		362
352	STRING="Checking filesystems"	363	STRING="Checking filesystems"
353	echo "$STRING"	364	echo "$STRING"
354	initlog -c "fsck -TRAay -t noloop $fsckoptions"	365	initlog -c "fsck -TRAay -t noloop $fsckoptions"
Lines 388-393 Link Here
388	fi	400	fi
389	fi	401	fi
390		402
		403	rc_splash mount 6
391	# Mount all other filesystems (except for NFS and /proc, which is already	404	# Mount all other filesystems (except for NFS and /proc, which is already
392	# mounted). Contrary to standard usage,	405	# mounted). Contrary to standard usage,
393	# filesystems are NOT unmounted in single user mode	406	# filesystems are NOT unmounted in single user mode
Lines 455-460 Link Here
455	# Language fixes	469	# Language fixes
456	/etc/rc.d/scripts/lang	470	/etc/rc.d/scripts/lang
457		471
		472	rc_splash swap 7
458	# Now turn on swap again (in case we swap to files)	473	# Now turn on swap again (in case we swap to files)
459	action "Activating swap space:" swapon -a	474	action "Activating swap space:" swapon -a
460		475
Lines 492-497 Link Here
492	# Update vconfig symlinks for VLAN configuration program	507	# Update vconfig symlinks for VLAN configuration program
493	ExecIfExecutable /etc/rc.d/scripts/vconfig-update	508	ExecIfExecutable /etc/rc.d/scripts/vconfig-update
494		509
		510	rc_splash chrooted 8
495	if [ -x /usr/sbin/update_chrooted ]; then	511	if [ -x /usr/sbin/update_chrooted ]; then
496	action "Updating chrooted environments:" /usr/sbin/update_chrooted conf lib	512	action "Updating chrooted environments:" /usr/sbin/update_chrooted conf lib
497	fi	513	fi

Return to bug 6274