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

diff --git a/components/9990-main.sh b/components/9990-main.sh
index e67176e..512c624 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
 
@@ -150,15 +148,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
@@ -180,10 +169,16 @@ Live ()
 		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 ] && [ ! -s ${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
 
@@ -197,12 +192,6 @@ Live ()
 
 	Swap
 
-	case "${UNIONFS}" in
-		unionfs-fuse)
-			umount "${rootmnt}/dev"
-			;;
-	esac
-
 	exec 1>&6 6>&-
 	exec 2>&7 7>&-
 	kill ${tailpid}