X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=6af14c38c6aef2a31e40eabbd0f32ba82d765b2d;hb=0ea72c7bbccfa3da69efdffc2dc464f5f4aadeae;hp=2a146d7a629c32dc06537d007ce9b650be63293e;hpb=eb06418dd7cee703f3e53cc7a51cb450b5d3b292;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 2a146d7..6af14c3 100755
--- a/scripts/live
+++ b/scripts/live
@@ -66,11 +66,21 @@ Arguments ()
 				set -x
 				;;
 
+			ethdevice=*)
+				DEVICE="${ARGUMENT#ethdevice=}"
+				export DEVICE
+				;;
+
 			fetch=*)
                                 FETCH="${ARGUMENT#fetch=}"
                                 export FETCH
                                 ;;
 
+			forcepersistentfsck)
+				FORCEPERSISTENTFSCK="Yes"
+				export FORCEPERSISTENTFSCK
+				;;
+
 			hook=*)
 				HOOK="${ARGUMENT#hook=}"
 				export HOOK
@@ -92,6 +102,11 @@ Arguments ()
 				export HOSTNAME LIVECONF
 				;;
 
+			isofrom=*|fromiso=*)
+				FROMISO="${ARGUMENT#*=}"
+				export FROMISO
+				;;
+
 			username=*)
 				USERNAME="${ARGUMENT#username=}"
 				LIVECONF="changed"
@@ -345,6 +360,13 @@ Arguments ()
 				export PERSISTENT_PATH
 				;;
 
+			persistent-subtext=*)
+				root_persistence="${root_persistence}-${ARGUMENT#persistent-subtext=}"
+				home_persistence="${home_persistence}-${ARGUMENT#persistent-subtext=}"
+				root_snapshot_label="${root_snapshot_label}-${ARGUMENT#persistent-subtext=}"
+				home_snapshot_label="${home_snapshot_label}-${ARGUMENT#persistent-subtext=}"
+				;;
+
 			nopersistent)
 				NOPERSISTENT="Yes"
 				export NOPERSISTENT
@@ -368,9 +390,9 @@ Arguments ()
 				mount -o bind /dev /root/dev
 
 				mkdir -p /root/var/run/network
-				chroot /root dhclient eth0
+				[ "${NETBOOT}" ] || chroot /root dhclient eth0
 				chroot /root wget -P /tmp "${location}"
-				chroot /root ifconfig eth0 down
+				[ "${NETBOOT}" ] || chroot /root ifconfig eth0 down
 
 				umount /root/sys
 				umount /root/proc
@@ -599,7 +621,7 @@ is_nice_device ()
 {
 	sysfs_path="${1#/sys}"
 
-	if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-[^-]*-(ide|scsi|usb))"
+	if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-|platform-mmc)"
 	then
 		return 0
 	elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'
@@ -618,7 +640,7 @@ copy_live_to ()
 
 	if [ -z "${MODULETORAM}" ]
 	then
-		size=$(fs_size "" ${copyfrom} "used")
+		size=$(fs_size "" ${copyfrom}/${LIVE_MEDIA_PATH} "used")
 	else
 		MODULETORAMFILE="${copyfrom}/${LIVE_MEDIA_PATH}/${MODULETORAM}"
 
@@ -661,7 +683,7 @@ copy_live_to ()
 
 	# begin copying (or uncompressing)
 	mkdir "${copyto}"
-	echo "mount -t ${fstype} ${mount_options} ${dev} ${copyto}"
+	log_begin_msg "mount -t ${fstype} ${mount_options} ${dev} ${copyto}"
 	mount -t "${fstype}" ${mount_options} "${dev}" "${copyto}"
 
 	if [ "${extension}" = "tgz" ]
@@ -674,9 +696,22 @@ copy_live_to ()
 	else
 		if [ -n "${MODULETORAMFILE}" ]
 		then
-			cp ${MODULETORAMFILE} ${copyto} # copy only the filesystem module
+			if [ -x /bin/rsync ]
+			then
+				echo " * Copying $MODULETORAMFILE to RAM" 1>/dev/console
+				rsync -a --progress ${MODULETORAMFILE} ${copyto} 1>/dev/console # copy only the filesystem module
+			else
+				cp ${MODULETORAMFILE} ${copyto} # copy only the filesystem module
+			fi
 		else
-			cp -a ${copyfrom}/* ${copyto}   # "cp -a" from busybox also copies hidden files
+			if [ -x /bin/rsync ]
+			then
+				echo " * Copying whole medium to RAM" 1>/dev/console
+				rsync -a --progress ${copyfrom}/* ${copyto} 1>/dev/console  # "cp -a" from busybox also copies hidden files
+			else
+				mkdir -p ${copyto}/${LIVE_MEDIA_PATH}
+				cp -a ${copyfrom}/${LIVE_MEDIA_PATH}/* ${copyto}/${LIVE_MEDIA_PATH}   # "cp -a" from busybox also copies hidden files
+			fi
 		fi
 
 		umount ${copyfrom}
@@ -1221,6 +1256,11 @@ setup_unionfs ()
 			cowdevice=${cowprobe}
 			cow_fstype=$(get_fstype "${cowprobe}")
 			cow_mountopt="rw,noatime"
+
+			if [ "${FORCEPERSISTENTFSCK}" = "Yes" ]
+			then
+				fsck -y ${cowdevice}
+			fi
 		else
 			log_warning_msg "Unable to find the persistent medium"
 			cowdevice="tmpfs"
@@ -1354,6 +1394,17 @@ check_dev ()
 	devname="${2}"
 	skip_uuid_check="${3}"
 
+	# support for fromiso=.../isofrom=....
+	if [ -n "$FROMISO" ]
+	then
+		mkdir /isofrom
+		ISO_DEVICE="$(echo $FROMISO | sed 's|\(/dev/[a-z]*[0-9]*\).*|\1|')"
+		mount "$ISO_DEVICE" /isofrom
+		ISO_NAME="$(echo $FROMISO | sed 's|/dev/[a-z]*[0-9]*/||')"
+		loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
+		devname="${loopdevname}"
+	fi
+
 	if [ -z "${devname}" ]
 	then
 		devname=$(sys2dev "${sysdev}")
@@ -1625,6 +1676,15 @@ mountroot ()
 		log_end_msg
 	fi
 
+	# if we do not unmount the ISO we can't run "fsck /dev/ice" later on
+	# because the mountpoint is left behind in /proc/mounts, so let's get
+	# rid of it when running from RAM
+	if [ -n "$FROMISO" ] && [ "${TORAM}" ]
+	then
+	  losetup -d /dev/loop0
+	  grep -q /isofrom /proc/mounts && umount /isofrom
+	fi
+
 	if [ -n "${MODULETORAMFILE}" ] || [ -n "${PLAIN_ROOT}" ]
 	then
 		setup_unionfs "${livefs_root}" "${rootmnt}"