Attachment #123068 for bug #166330

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

Lines 50-55 Link Here

(-)8.2-THINSERVER/etc/rc (-2 / +15 lines)
50	PATH=/sbin:/bin:/usr/sbin:/usr/bin	50	PATH=/sbin:/bin:/usr/sbin:/usr/bin
51	export HOME PATH	51	export HOME PATH
52		52
		53	# If an fstab named by my hostname exists, export it.
		54	if [ -f "/etc/fstab.d/`kenv dhcp.host-name`" ]; then
		55	export PATH_FSTAB=/etc/fstab.d/`kenv dhcp.host-name`
		56	fi
		57
53	if [ "$1" = autoboot ]; then	58	if [ "$1" = autoboot ]; then
54	autoboot=yes	59	autoboot=yes
55	_boot="faststart"	60	_boot="faststart"
Lines 60-66 Link Here
60	fi	65	fi
61		66
62	dlv=`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null`	67	dlv=`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null`
63	if [ ${dlv:=0} -ne 0 -o -f /etc/diskless ]; then	68	# New thinserver approach takes precedence over diskless.
		69	if [ -f /etc/thinserver ]; then
		70	skip="$skip -s nothinserver"
		71	elif [ ${dlv:=0} -ne 0 -o -f /etc/diskless ]; then
64	sh /etc/rc.initdiskless	72	sh /etc/rc.initdiskless
65	fi	73	fi
66		74
Lines 71-77 Link Here
71	. /etc/rc.subr	79	. /etc/rc.subr
72	load_rc_config 'XXX'	80	load_rc_config 'XXX'
73		81
74	skip="-s nostart"	82	# Try load_rc_config with my hostname.
		83	if [ -n "`kenv dhcp.host-name`" ]; then
		84	load_rc_config `kenv dhcp.host-name`
		85	fi
		86
		87	skip="$skip -s nostart"
75	if [ `/sbin/sysctl -n security.jail.jailed` -eq 1 ]; then	88	if [ `/sbin/sysctl -n security.jail.jailed` -eq 1 ]; then
76	skip="$skip -s nojail"	89	skip="$skip -s nojail"
77	if [ "$early_late_divider" = "FILESYSTEMS" ]; then	90	if [ "$early_late_divider" = "FILESYSTEMS" ]; then

Lines 5-11 Link Here

(-)8.2-THINSERVER/etc/rc.d/bgfsck (-1 / +1 lines)
5		5
6	# PROVIDE: bgfsck	6	# PROVIDE: bgfsck
7	# REQUIRE: cron devfs syslogd	7	# REQUIRE: cron devfs syslogd
8	# KEYWORD: nojail	8	# KEYWORD: nojail nothinserver
9		9
10	. /etc/rc.subr	10	. /etc/rc.subr
11		11

Lines 5-11 Link Here

(-)8.2-THINSERVER/etc/rc.d/dumpon (-1 / +1 lines)
5		5
6	# PROVIDE: dumpon	6	# PROVIDE: dumpon
7	# BEFORE: disks savecore initrandom	7	# BEFORE: disks savecore initrandom
8	# KEYWORD: nojail	8	# KEYWORD: nojail nothinserver
9		9
10	. /etc/rc.subr	10	. /etc/rc.subr
11		11

Lines 5-11 Link Here

(-)8.2-THINSERVER/etc/rc.d/encswap (-1 / +1 lines)
5		5
6	# PROVIDE: disks	6	# PROVIDE: disks
7	# REQUIRE: initrandom	7	# REQUIRE: initrandom
8	# KEYWORD: nojail	8	# KEYWORD: nojail nothinserver
9		9
10	. /etc/rc.subr	10	. /etc/rc.subr
11		11

Lines 5-11 Link Here

(-)8.2-THINSERVER/etc/rc.d/fsck (-1 / +1 lines)
5		5
6	# PROVIDE: fsck	6	# PROVIDE: fsck
7	# REQUIRE: localswap	7	# REQUIRE: localswap
8	# KEYWORD: nojail	8	# KEYWORD: nojail nothinserver
9		9
10	. /etc/rc.subr	10	. /etc/rc.subr
11		11

Lines 29-35 Link Here

(-)8.2-THINSERVER/etc/rc.d/geli (-1 / +1 lines)
29		29
30	# PROVIDE: disks	30	# PROVIDE: disks
31	# REQUIRE: initrandom	31	# REQUIRE: initrandom
32	# KEYWORD: nojail	32	# KEYWORD: nojail nothinserver
33		33
34	. /etc/rc.subr	34	. /etc/rc.subr
35		35

Lines 29-35 Link Here

(-)8.2-THINSERVER/etc/rc.d/geli2 (-1 / +1 lines)
29		29
30	# PROVIDE: geli2	30	# PROVIDE: geli2
31	# REQUIRE: FILESYSTEMS	31	# REQUIRE: FILESYSTEMS
32	# KEYWORD: nojail	32	# KEYWORD: nojail nothinserver
33		33
34	. /etc/rc.subr	34	. /etc/rc.subr
35		35

Lines 27-37 Link Here

(-)8.2-THINSERVER/etc/rc.d/mountcritlocal (-1 / +5 lines)
27	;;	27	;;
28	esac	28	esac
29		29
30	# Mount everything except nfs filesystems.	30	# Mount everything except nfs filesystems when NOT using
		31	# thinserver.
31	check_startmsgs && echo -n 'Mounting local file systems:'	32	check_startmsgs && echo -n 'Mounting local file systems:'
32	mount_excludes='no'	33	mount_excludes='no'
		34	[ -f /etc/thinserver ] && thinserver='yes'
33	for i in ${netfs_types}; do	35	for i in ${netfs_types}; do
34	fstype=${i%:*}	36	fstype=${i%:*}
		37	[ "$thinserver" = "yes" ] && [ "$fstype" = "nfs" ] && \
		38	continue
35	mount_excludes="${mount_excludes}${fstype},"	39	mount_excludes="${mount_excludes}${fstype},"
36	done	40	done
37	mount_excludes=${mount_excludes%,}	41	mount_excludes=${mount_excludes%,}

Lines 5-11 Link Here

(-)8.2-THINSERVER/etc/rc.d/mountcritremote (-1 / +1 lines)
5		5
6	# PROVIDE: mountcritremote	6	# PROVIDE: mountcritremote
7	# REQUIRE: NETWORKING FILESYSTEMS cleanvar ipsec	7	# REQUIRE: NETWORKING FILESYSTEMS cleanvar ipsec
8	# KEYWORD: nojail	8	# KEYWORD: nojail nothinserver
9		9
10	. /etc/rc.subr	10	. /etc/rc.subr
11		11

Lines 6-12 Link Here

(-)8.2-THINSERVER/etc/rc.d/savecore (-1 / +1 lines)
6	# PROVIDE: savecore	6	# PROVIDE: savecore
7	# REQUIRE: syslogd	7	# REQUIRE: syslogd
8	# BEFORE: SERVERS	8	# BEFORE: SERVERS
9	# KEYWORD: nojail	9	# KEYWORD: nojail nothinserver
10		10
11	. /etc/rc.subr	11	. /etc/rc.subr

Return to bug 166330