X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=295b75faaedf255c4b30d31193bebc077826f8d3;hb=66d1235abf2dbc4062ed5bb7aef28d99a5a38eb2;hp=37c3abd3009840df337687b7b57ac4d08125a35d;hpb=cda125e58e225a96de05102884c4f469895e45e7;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 37c3abd..295b75f 100755
--- a/scripts/live
+++ b/scripts/live
@@ -88,12 +88,8 @@ Arguments ()
 
 			ethdevice=*)
 				DEVICE="${ARGUMENT#ethdevice=}"
-				export DEVICE
-				;;
-
-			ethdevice=*)
-				ETHDEVICE="${ARGUMENT#ethdevice=}"
-				export ETHDEVICE
+				ETHDEVICE="${DEVICE}"
+				export DEVICE ETHDEVICE
 				;;
 
 			ethdevice-timeout=*)
@@ -215,11 +211,6 @@ Arguments ()
 				export NOACCESSIBILITY
 				;;
 
-			noautologin)
-				NOAUTOLOGIN="Yes"
-				export NOAUTOLOGIN
-				;;
-
 			nofastboot)
 				NOFASTBOOT="Yes"
 				export NOFASTBOOT
@@ -648,6 +639,22 @@ do_netsetup ()
 		HWADDR="$(cat /sys/class/net/${DEVICE}/address)"
 	fi
 
+	if [ ! -e "/etc/resolv.conf" ]
+	then
+		echo "Creating /etc/resolv.conf"
+
+		if [ -n "${DNSDOMAIN}" ]
+		then
+			echo "domain ${DNSDOMAIN}" > /etc/resolv.conf
+			echo "search ${DNSDOMAIN}" > /etc/resolv.conf
+		fi
+
+		for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1}
+		do
+			echo "nameserver $i" >> /etc/resolv.conf
+		done
+	fi
+
 	# Check if we have a network device at all
 	if ! ls /sys/class/net/"$DEVICE" > /dev/null 2>&1 && \
 	   ! ls /sys/class/net/eth0 > /dev/null 2>&1 && \
@@ -969,19 +976,20 @@ try_snap ()
 		snapback="$(echo ${snapdata} | cut -f2 -d ' ')"
 		snapfile="$(echo ${snapdata} | cut -f3 -d ' ')"
 
-		RES=""
 		if ! try_mount "${snapdev}" "${snapback}" "ro"
 		then
 			break
 		fi
 
+		RES="0"
+
 		if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\|ext3\|ext4\|jffs2\)'
 		then
 			# squashfs, jffs2 or ext2/ext3/ext4 snapshot
 			dev=$(get_backing_device "${snapback}/${snapfile}")
 
 			do_snap_copy "${dev}" "${snap_mount}" "${snap_type}"
-			RES=$?
+			RES="$?"
 		else
 			# cpio.gz snapshot
 
@@ -997,9 +1005,12 @@ try_snap ()
 				cpioargs='--unconditional --make-directories'
 			fi
 
-			if ! (cd "${snap_mount}" && zcat "${snapback}/${snapfile}" | cpio $cpioargs --extract --preserve-modification-time --no-absolute-filenames --sparse 2>/dev/null)
+			cd "${snap_mount}" && zcat "${snapback}/${snapfile}" | $cpiopath $cpioargs --extract --preserve-modification-time --no-absolute-filenames --sparse 2>/dev/null
+			RES="$?"
+
+			if [ "${RES}" != "0" ]
 			then
-				log_warning_msg "failure to \"zcat ${snapback}/${snapfile} | cpio $cpioargs --extract --preserve-modification-time --no-absolute-filenames --sparse\""
+				log_warning_msg "failure to \"zcat ${snapback}/${snapfile} | $cpiopath $cpioargs --extract --preserve-modification-time --no-absolute-filenames --sparse\""
 			fi
 		fi
 
@@ -1600,6 +1611,7 @@ find_livefs ()
 				fi
 			done
 		elif [ "${fstype}" = "squashfs" -o \
+			"${fstype}" = "btrfs" -o \
 			"${fstype}" = "ext2" -o \
 			"${fstype}" = "ext3" -o \
 			"${fstype}" = "ext4" -o \
@@ -1709,6 +1721,20 @@ mountroot ()
 			# Do a local boot from hd
 			livefs_root=${ROOT}
 		else
+			if [ -x /usr/bin/memdiskfind ]
+			then
+				MEMDISK=$(/usr/bin/memdiskfind)
+
+				if [ $? -eq 0 ]
+				then
+					# We found a memdisk, set up phram
+					modprobe phram phram=memdisk,${MEMDISK}
+
+					# Load mtdblock, the memdisk will be /dev/mtdblock0
+					modprobe mtdblock
+				fi
+			fi
+
 			# Scan local devices for the image
 			i=0
 			while [ "$i" -lt 60 ]