diff -ruN 2/init.d/bootmisc 1/init.d/bootmisc
--- 2/init.d/bootmisc	2005-01-30 22:23:10.000000000 +0100
+++ 1/init.d/bootmisc	2005-06-16 16:06:11.000000000 +0200
@@ -31,6 +31,24 @@
 			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
diff -ruN 2/init.d/checkfs 1/init.d/checkfs
--- 2/init.d/checkfs	2005-05-17 02:04:04.000000000 +0200
+++ 1/init.d/checkfs	2005-06-16 16:08:56.000000000 +0200
@@ -12,12 +12,14 @@
 
 	# Start RAID/LVM/EVMS/DM volumes for /usr, /var, etc.
 	# NOTE: this should be done *before* mounting anything
-	[[ -z ${CDBOOT} ]] && start_volumes
+	if [[ -z ${CDBOOT} ]] && [[ -z ${NFSBOOT} ]] ; then
+	        start_volumes
+	fi
 
 	# Setup dm-crypt mappings if any
 	start_addon dm-crypt
 
-	if [[ -f /fastboot ]] || [[ -n ${CDBOOT} ]] ; then
+	if [[ -f /fastboot ]] || [[ -n ${CDBOOT} ]] || [[ -n ${NFSBOOT} ]] ; then
 		rm -f /fastboot
 	else
 		ebegin "Checking all filesystems"
diff -ruN 2/init.d/checkroot 1/init.d/checkroot
--- 2/init.d/checkroot	2005-05-17 02:04:08.000000000 +0200
+++ 1/init.d/checkroot	2005-06-16 16:09:29.000000000 +0200
@@ -8,6 +8,11 @@
 }
 
 start() {
+	if [[ -n ${NFSBOOT} ]] ; then
+		umount /initrd
+		return 0
+	fi
+
 	local retval=0
 
 	if [[ ! -f /fastboot && -z ${CDBOOT} ]] ; then
diff -ruN 2/init.d/modules 1/init.d/modules
--- 2/init.d/modules	2005-04-28 05:41:26.000000000 +0200
+++ 1/init.d/modules	2005-06-16 16:10:05.000000000 +0200
@@ -81,7 +81,7 @@
 		return 1
 	fi
 
-	if [ -z "${CDBOOT}" ] && touch /etc/modules.conf 2> /dev/null
+	if [ -z "${CDBOOT}" ] && [ -z "${NFSBOOT}" ] && touch /etc/modules.conf 2> /dev/null
 	then
 		ebegin "Calculating module dependencies"
 		/sbin/modules-update &>/dev/null
diff -ruN 2/sbin/livecd-functions.sh 1/sbin/livecd-functions.sh
--- 2/sbin/livecd-functions.sh	2004-12-07 17:40:06.000000000 +0100
+++ 1/sbin/livecd-functions.sh	2005-05-19 12:13:55.000000000 +0200
@@ -108,6 +108,10 @@
 				CDBOOT="yes"
 				export CDBOOT
 			;;
+			nfsroot)
+	                        NFSBOOT="yes"
+                                export NFSBOOT
+			;;
 			console\=*)
 				local live_console
 				live_console=`livecd_parse_opt "${x}"`