X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=35ba702619702c9d33645feb5e889124a6baf1ee;hb=refs%2Ftags%2Fdebian%2F1.91.4-1;hp=26fde4dbe8cdef4e980e4fdaf9384b899fd43637;hpb=a6a9d36d569ca73b14f197dbd5a3e06189884e27;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 26fde4d..35ba702 100755
--- a/scripts/live
+++ b/scripts/live
@@ -7,7 +7,7 @@ export PATH=/root/usr/bin:/root/usr/sbin:/root/bin:/root/sbin:/usr/bin:/usr/sbin
 echo "/root/lib" >> /etc/ld.so.conf
 echo "/root/usr/lib" >> /etc/ld.so.conf
 
-mountpoint=/live_media
+mountpoint=/live/image
 
 root_persistence="live-rw"
 home_persistence="home-rw"
@@ -49,6 +49,13 @@ parse_cmdline ()
 				export DEFCONFSOLE
 				;;
 
+			debug)
+				DEBUG="Yes"
+				export DEBUG
+
+				set -x
+				;;
+
 			hostname=*)
 				HOSTNAME=${x#hostname=}
 				LIVECONF="changed"
@@ -95,10 +102,12 @@ parse_cmdline ()
 
 			kmodel=*|console-setup/modelcode=*)
 				KMODEL=${x#*=}
+				export KMODEL
 				;;
 
 			koptions=*)
 				KOPTIONS=${x#koptions=}
+				export KOPTIONS
 				;;
 
 			live-getty)
@@ -141,7 +150,7 @@ parse_cmdline ()
 				export NETBOOT
 				;;
 
-			nfsopts=)
+			nfsopts=*)
 				NFSOPTS=${x#nfsopts=}
 				export NFSOPTS
 				;;
@@ -156,6 +165,11 @@ parse_cmdline ()
 				export NOXAUTOLOGIN
 				;;
 
+			nofastboot)
+				NOFASTBOOT="Yes"
+				export NOFASTBOOT
+				;;
+
 			nopersistent)
 				PERSISTENT=""
 				export PERSISTENT
@@ -194,6 +208,11 @@ parse_cmdline ()
 				export SHOWMOUNTS
 				;;
 
+			timezone=*)
+				TIMEZONE="${x#timezone=}"
+				export TIMEZONE
+				;;
+
 			todisk=*)
 				TODISK=${x#todisk=}
 				export TODISK
@@ -204,6 +223,11 @@ parse_cmdline ()
 				export TORAM
 				;;
 
+			union=*)
+				UNIONTYPE="${x#union=}"
+				export UNIONTYPE
+				;;
+
 			xdebconf)
 				XDEBCONF="Yes"
 				export XDEBCONF
@@ -233,6 +257,13 @@ parse_cmdline ()
 	if [ -z "${MODULE}" ]
 	then
 		MODULE="filesystem"
+		export MODULE
+	fi
+
+	if [ -z "${UNIONTYPE}" ]
+	then
+		UNIONTYPE="unionfs"
+		export UNIONTYPE
 	fi
 }
 
@@ -520,7 +551,7 @@ setup_unionfs() {
     image_directory="$1"
     rootmnt="$2"
 
-    modprobe "${MP_QUIET}" -b unionfs
+    modprobe "${MP_QUIET}" -b ${UNIONTYPE}
 
     # run-init can't deal with images in a subdir, but we're going to
     # move all of these away before it runs anyway.  No, we're not,
@@ -604,7 +635,7 @@ setup_unionfs() {
 
     mount ${cowdevice} -t ${cow_fstype} -o rw /cow || panic "Can not mount $cowdevice on /cow"
 
-    mount -t unionfs -o dirs=/cow=rw:$rofsstring unionfs "$rootmnt" || panic "Unionfs mount failed"
+    mount -t ${UNIONTYPE} -o dirs=/cow=rw:$rofsstring ${UNIONTYPE} "$rootmnt" || panic "${UNIONTYPE} mount failed"
 
     # Adding other custom mounts
     if [ -n "${PERSISTENT}" ]; then
@@ -635,8 +666,8 @@ setup_unionfs() {
     fi
 
     # shows cow fs on /cow for use by live-snapshot
-    mkdir -p "${rootmnt}/cow"
-    mount -o bind /cow "${rootmnt}/cow"
+    mkdir -p "${rootmnt}/live/cow"
+    mount -o bind /cow "${rootmnt}/live/cow"
 }
 
 check_dev ()
@@ -769,7 +800,7 @@ mountroot() {
         live_dest="${TODISK}"
     fi
     if [ "${live_dest}" ]; then
-        log_begin_msg "Copying live_media to ${live_dest}"
+        log_begin_msg "Copying live media to ${live_dest}"
         copy_live_to "${livefs_root}" "${live_dest}"
         log_end_msg
     fi