Attachment #62062 for bug #97215

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




			return 0
		fi

		#
		# Make struct for /var/lock and /var/run in NFSBOOT
		#
		if [[ -n ${NFSBOOT} ]] ; then
			if [[ `cat /proc/mounts |grep /var/run` ]] ; then
				for x in console dhcp hald iptraf mysqld \
					openldap samba usb vmware screen
				do
				    mkdir "/var/run/${x}"
				done
				chown mysql:mysql /var/run/mysqld
				chown ldap:ldap /var/run/openldap
			fi
			if [[ `cat /proc/mounts |grep /var/lock` ]] ; then
				mkdir /var/lock/subsys
			fi
		fi

		if [[ -x /sbin/env-update.sh ]] ; then
			ebegin "Updating environment"
			/sbin/env-update.sh -u > /dev/null

Lines 12-23 Link Here

(-)2/init.d/checkfs (-2 / +4 lines)
12		12
13	# Start RAID/LVM/EVMS/DM volumes for /usr, /var, etc.	13	# Start RAID/LVM/EVMS/DM volumes for /usr, /var, etc.
14	# NOTE: this should be done before mounting anything	14	# NOTE: this should be done before mounting anything
15	[[ -z ${CDBOOT} ]] && start_volumes	15	if [[ -z ${CDBOOT} ]] && [[ -z ${NFSBOOT} ]] ; then
		16	start_volumes
		17	fi
16		18
17	# Setup dm-crypt mappings if any	19	# Setup dm-crypt mappings if any
18	start_addon dm-crypt	20	start_addon dm-crypt
19		21
20	if [[ -f /fastboot ]] \|\| [[ -n ${CDBOOT} ]] ; then	22	if [[ -f /fastboot ]] \|\| [[ -n ${CDBOOT} ]] \|\| [[ -n ${NFSBOOT} ]] ; then
21	rm -f /fastboot	23	rm -f /fastboot
22	else	24	else
23	ebegin "Checking all filesystems"	25	ebegin "Checking all filesystems"

Lines 8-13 Link Here

(-)2/init.d/checkroot (+5 lines)
8	}	8	}
9		9
10	start() {	10	start() {
		11	if [[ -n ${NFSBOOT} ]] ; then
		12	umount /initrd
		13	return 0
		14	fi
		15
11	local retval=0	16	local retval=0
12		17
13	if [[ ! -f /fastboot && -z ${CDBOOT} ]] ; then	18	if [[ ! -f /fastboot && -z ${CDBOOT} ]] ; then

Lines 81-87 Link Here

(-)2/init.d/modules (-1 / +1 lines)
81	return 1	81	return 1
82	fi	82	fi
83		83
84	if [ -z "${CDBOOT}" ] && touch /etc/modules.conf 2> /dev/null	84	if [ -z "${CDBOOT}" ] && [ -z "${NFSBOOT}" ] && touch /etc/modules.conf 2> /dev/null
85	then	85	then
86	ebegin "Calculating module dependencies"	86	ebegin "Calculating module dependencies"
87	/sbin/modules-update &>/dev/null	87	/sbin/modules-update &>/dev/null

Lines 108-113 Link Here

(-)2/sbin/livecd-functions.sh (+4 lines)
108	CDBOOT="yes"	108	CDBOOT="yes"
109	export CDBOOT	109	export CDBOOT
110	;;	110	;;
		111	nfsroot)
		112	NFSBOOT="yes"
		113	export NFSBOOT
		114	;;
111	console\=*)	115	console\=*)
112	local live_console	116	local live_console
113	live_console=`livecd_parse_opt "${x}"`	117	live_console=`livecd_parse_opt "${x}"`

Return to bug 97215

Lines 31-36 Link Here

(-)2/init.d/bootmisc (+18 lines)
31	return 0	31	return 0
32	fi	32	fi
33		33
		34	#
		35	# Make struct for /var/lock and /var/run in NFSBOOT
		36	#
		37	if [[ -n ${NFSBOOT} ]] ; then
		38	if [[ `cat /proc/mounts \|grep /var/run` ]] ; then
		39	for x in console dhcp hald iptraf mysqld \
		40	openldap samba usb vmware screen
		41	do
		42	mkdir "/var/run/${x}"
		43	done
		44	chown mysql:mysql /var/run/mysqld
		45	chown ldap:ldap /var/run/openldap
		46	fi
		47	if [[ `cat /proc/mounts \|grep /var/lock` ]] ; then
		48	mkdir /var/lock/subsys
		49	fi
		50	fi
		51
34	if [[ -x /sbin/env-update.sh ]] ; then	52	if [[ -x /sbin/env-update.sh ]] ; then
35	ebegin "Updating environment"	53	ebegin "Updating environment"
36	/sbin/env-update.sh -u > /dev/null	54	/sbin/env-update.sh -u > /dev/null