X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=d35fb0814c758d48699e6d5e96b17a7362f74a56;hb=b1e77d7bb3bf329a929296afc8f285e178f65370;hp=2e40b45c4801d2a93861ae8ebae849a94ac2166b;hpb=a3ac28c3dfe8f4d77c10eb8fa92f96ef19bf1c68;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 2e40b45..d35fb08 100755
--- a/scripts/live
+++ b/scripts/live
@@ -51,14 +51,11 @@ Arguments ()
 		case "${ARGUMENT}" in
 			skipconfig)
 				NOACCESSIBILITY="Yes"
-				NOAUTOLOGIN="Yes"
-				NOCONSOLEKEYBOARD="Yes"
 				NOFASTBOOT="Yes"
 				NOFSTAB="Yes"
 				NONETWORKING="Yes"
-				NOXAUTOCONFIG="Yes"
 
-				export NOACCESSIBILITY NOAUTOLOGIN NOCONSOLEKEYBOARD NOFASTBOOT NOFSTAB NONETWORKING NOXAUTOCONFIG
+				export NOACCESSIBILITY NOFASTBOOT NOFSTAB NONETWORKING
 				;;
 
 			access=*)
@@ -218,11 +215,6 @@ Arguments ()
 				export NOACCESSIBILITY
 				;;
 
-			noautologin)
-				NOAUTOLOGIN="Yes"
-				export NOAUTOLOGIN
-				;;
-
 			nofastboot)
 				NOFASTBOOT="Yes"
 				export NOFASTBOOT
@@ -243,11 +235,6 @@ Arguments ()
 				export SWAPON
 				;;
 
-			noxautoconfig)
-				NOXAUTOCONFIG="Yes"
-				export NOXAUTOCONFIG
-				;;
-
 			persistent)
 				PERSISTENT="Yes"
 				export PERSISTENT
@@ -351,21 +338,6 @@ Arguments ()
 				UNIONTYPE="${ARGUMENT#union=}"
 				export UNIONTYPE
 				;;
-
-			xdebconf)
-				XDEBCONF="Yes"
-				export XDEBCONF
-				;;
-
-			xdriver=*)
-			        XDRIVER="${ARGUMENT#xdriver=}"
-				export XDRIVER
-				;;
-
-			xvideomode=*)
-				XVIDEOMODE="${ARGUMENT#xvideomode=}"
-				export XVIDEOMODE
-				;;
 		esac
 	done
 
@@ -757,6 +729,8 @@ do_iscsi()
 		do
 			if check_dev "null" "/dev/$dev"
 			then
+				NETBOOT="iscsi"
+				export NETBOOT
 				return 0;
 			fi
 		done
@@ -764,8 +738,6 @@ do_iscsi()
 	else
 		panic "Failed to locate iSCSI host in /sys"
 	fi
-	NETBOOT="iscsi"
-	export NETBOOT
 }
 
 do_httpmount ()
@@ -1020,9 +992,9 @@ 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)
+			if ! (cd "${snap_mount}" && zcat "${snapback}/${snapfile}" | $cpiopath $cpioargs --extract --preserve-modification-time --no-absolute-filenames --sparse 2>/dev/null)
 			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
 
@@ -1732,6 +1704,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 ]