X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-main.sh;h=4ea8ee118c7c373fde02fc6668df420fcff2e707;hb=07d13d4a81e8e3ea3f7cff63a6528efd5a46b1e7;hp=e67176ef44ab169c8f47ab5207c00bfa23148ef2;hpb=a331218718282c5496ff062a0f6aa55908224862;p=live-boot-grml.git

diff --git a/components/9990-main.sh b/components/9990-main.sh
index e67176e..4ea8ee1 100755
--- a/components/9990-main.sh
+++ b/components/9990-main.sh
@@ -16,8 +16,6 @@ Live ()
 	tail -f boot.log >&7 &
 	tailpid="${!}"
 
-	. /live.vars
-
 	LIVE_BOOT_CMDLINE="${LIVE_BOOT_CMDLINE:-$(cat /proc/cmdline)}"
 	Cmdline_old
 
@@ -39,7 +37,7 @@ Live ()
 	then
 		if do_netmount
 		then
-			livefs_root="${mountpoint}"
+			livefs_root="${mountpoint?}"
 		else
 			panic "Unable to find a live file system on the network"
 		fi
@@ -54,12 +52,22 @@ Live ()
 		else
 			if [ -x /usr/bin/memdiskfind ]
 			then
-				MEMDISK=$(/usr/bin/memdiskfind)
-
-				if [ $? -eq 0 ]
+				if ! MEMDISK=$(/usr/bin/memdiskfind)
 				then
 					# We found a memdisk, set up phram
-					modprobe phram phram=memdisk,${MEMDISK}
+					# Sometimes "modprobe phram" can not successfully create /dev/mtd0.
+				        # Have to try several times.
+					max_try=20
+					while [ ! -c /dev/mtd0 ] && [ "$max_try" -gt 0 ]; do
+					  modprobe phram "phram=memdisk,${MEMDISK}"
+					  sleep 0.2
+					  if [ -c /dev/mtd0 ]; then
+					  	break
+					  else
+					  	rmmod phram
+				  	  fi
+					  max_try=$((max_try - 1))
+					done
 
 					# Load mtdblock, the memdisk will be /dev/mtdblock0
 					modprobe mtdblock
@@ -78,7 +86,7 @@ Live ()
 				fi
 
 				sleep 1
-				i="$(($i + 1))"
+				i=$((i + 1))
 			done
 		fi
 	fi
@@ -112,37 +120,23 @@ Live ()
 	then
 		losetup -d /dev/loop0
 
-		if is_mountpoint /live/fromiso
+		if is_mountpoint /run/live/fromiso
 		then
-			umount /live/fromiso
-			rmdir --ignore-fail-on-non-empty /live/fromiso \
+			umount /run/live/fromiso
+			rmdir --ignore-fail-on-non-empty /run/live/fromiso \
 				>/dev/null 2>&1 || true
 		fi
 	fi
 
 	if [ -n "${MODULETORAMFILE}" ] || [ -n "${PLAIN_ROOT}" ]
 	then
-		setup_unionfs "${livefs_root}" "${rootmnt}"
+		setup_unionfs "${livefs_root}" "${rootmnt?}"
 	else
 		mac="$(get_mac)"
-		mac="$(echo ${mac} | sed 's/-//g')"
+		mac="$(echo "${mac}" | sed 's/-//g')"
 		mount_images_in_directory "${livefs_root}" "${rootmnt}" "${mac}"
 	fi
 
-	# At this point /root should contain the final root filesystem.
-	# Move all mountpoints below /live into /root/lib/live/mount.
-	# This has to be done after mounting the root filesystem to /
-	# otherwise these mount points won't be accessible from the running system.
-	for _MOUNT in $(cat /proc/mounts | cut -f 2 -d " " | grep -e "^/live/")
-	do
-		local newmount
-		newmount="${rootmnt}/lib/live/mount/${_MOUNT#/live/}"
-		mkdir -p "${newmount}"
-		mount -o move "${_MOUNT}" "${newmount}" > /dev/null 2>&1 || \
-		mount -o bind "${_MOUNT}" "${newmount}" > /dev/null || \
-		log_warning_msg "W: failed to move or bindmount ${_MOUNT} to ${newmount}"
-	done
-
 	if [ -n "${ROOT_PID}" ]
 	then
 		echo "${ROOT_PID}" > "${rootmnt}"/lib/live/root.pid
@@ -150,15 +144,6 @@ Live ()
 
 	log_end_msg
 
-	# unionfs-fuse needs /dev to be bind-mounted for the duration of
-	# live-bottom; udev's init script will take care of things after that
-	case "${UNIONTYPE}" in
-		unionfs-fuse)
-			mount -n -o bind /dev "${rootmnt}/dev"
-			;;
-	esac
-
-
 	# aufs2 in kernel versions around 2.6.33 has a regression:
 	# directories can't be accessed when read for the first the time,
 	# causing a failure for example when accessing /var/lib/fai
@@ -172,18 +157,24 @@ Live ()
 	then
 		losetup -d /dev/loop0
 
-		if is_mountpoint /root/lib/live/mount/findiso
+		if is_mountpoint /run/live/findiso
 		then
-			umount /root/lib/live/mount/findiso
-			rmdir --ignore-fail-on-non-empty /root/lib/live/mount/findiso \
+			umount /run/live/findiso
+			rmdir --ignore-fail-on-non-empty /run/live/findiso \
 				>/dev/null 2>&1 || true
 		fi
 	fi
 
-	if [ -f /etc/resolv.conf ] && [ ! -s ${rootmnt}/etc/resolv.conf ]
+	if [ -L /root/etc/resolv.conf ] ; then
+		# assume we have resolvconf
+		DNSFILE="${rootmnt}/etc/resolvconf/resolv.conf.d/base"
+	else
+		DNSFILE="${rootmnt}/etc/resolv.conf"
+	fi
+	if [ -f /etc/resolv.conf ] && ! grep -E -q -v '^[[:space:]]*#|^[[:space:]]*$' "${DNSFILE}"
 	then
-		log_begin_msg "Copying /etc/resolv.conf to ${rootmnt}/etc/resolv.conf"
-		cp -v /etc/resolv.conf ${rootmnt}/etc/resolv.conf
+		log_begin_msg "Copying /etc/resolv.conf to ${DNSFILE}"
+		cp -v /etc/resolv.conf "${DNSFILE}"
 		log_end_msg
 	fi
 
@@ -192,19 +183,22 @@ Live ()
 		panic "A wrong rootfs was mounted."
 	fi
 
+	# avoid breaking existing user scripts that rely on the old path
+	# this includes code that checks what is mounted on /lib/live/mount/*
+	# (eg: grep /lib/live /proc/mount)
+	# XXX: to be removed before the bullseye release
+	mkdir -p "${rootmnt}/lib/live/mount"
+	mount --rbind /run/live "${rootmnt}/lib/live/mount"
+
 	Fstab
 	Netbase
 
 	Swap
 
-	case "${UNIONFS}" in
-		unionfs-fuse)
-			umount "${rootmnt}/dev"
-			;;
-	esac
-
 	exec 1>&6 6>&-
 	exec 2>&7 7>&-
 	kill ${tailpid}
-	[ -w "${rootmnt}/var/log/" ] && mkdir -p "${rootmnt}/var/log/live" && cp boot.log "${rootmnt}/var/log/live" 2>/dev/null
+	[ -w "${rootmnt}/var/log/" ] && mkdir -p "${rootmnt}/var/log/live" && ( \
+				cp boot.log "${rootmnt}/var/log/live" 2>/dev/null; \
+				cp fsck.log "${rootmnt}/var/log/live" 2>/dev/null )
 }