X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=4169c9044b1c520917dc0ea8a14ec8e48535bb77;hb=244fa082e2493d6723dbc425686618126321028c;hp=6f4f5c196802e3031338f12423fba9368b6fa6f2;hpb=0e30bd5d6366275cd0465e45b2ac270a81a90157;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 6f4f5c1..4169c90 100755
--- a/scripts/live
+++ b/scripts/live
@@ -53,31 +53,19 @@ Arguments ()
 		case "${ARGUMENT}" in
 			skipconfig)
 				NOACCESSIBILITY="Yes"
-				NOAPPARMOR="Yes"
 				NOAPTCDROM="Yes"
 				NOAUTOLOGIN="Yes"
 				NOCONSOLEKEYBOARD="Yes"
 				NOFASTBOOT="Yes"
 				NOFSTAB="Yes"
-				NOGNOMEPANEL="Yes"
 				NOHOSTS="Yes"
-				NOJOCKEY="Yes"
-				NOKPERSONALIZER="Yes"
-				NOLANGUAGESELECTOR="Yes"
 				NOLOCALES="Yes"
 				NONETWORKING="Yes"
-				NOPOLKITCONF="Yes"
-				NOPOWERMANAGEMENT="Yes"
-				NOPROGRAMCRASHES="Yes"
-				NOSUDO="Yes"
 				NOTIMEZONE="Yes"
-				NOUPDATENOTIFIER="Yes"
-				NOUSER="Yes"
 				NOXAUTOCONFIG="Yes"
 				NOXAUTOLOGIN="Yes"
-				NOXSCREENSAVER="Yes"
 
-				export NOACCESSIBILITY NOAPPARMOR NOAPTCDROM NOAUTOLOGIN NOCONSOLEKEYBOARD NOFASTBOOT NOFSTAB NOGNOMEPANEL NOHOSTS NOJOCKEY NOKPERSONALIZER NOLANGUAGESELECTOR NOLOCALES NONETWORKING NOPOLKITCONF NOPOWERMANAGEMENT NOPROGRAMCRASHES NOSUDO NOTIMEZONE NOUPDATENOTIFIER NOUSER NOXAUTOCONFIG NOXAUTOLOGIN NOXSCREENSAVER
+				export NOACCESSIBILITY NOAPTCDROM NOAUTOLOGIN NOCONSOLEKEYBOARD NOFASTBOOT NOFSTAB NOHOSTS NOLOCALES NONETWORKING NOTIMEZONE NOXAUTOCONFIG NOXAUTOLOGIN
 				;;
 
 			access=*)
@@ -122,11 +110,6 @@ Arguments ()
 				export FORCEPERSISTENTFSCK
 				;;
 
-			hook=*)
-				HOOK="${ARGUMENT#hook=}"
-				export HOOK
-				;;
-
 			ftpfs=*)
 				FTPFS="${ARGUMENT#ftpfs=}"
 				export FTPFS
@@ -137,12 +120,6 @@ Arguments ()
 				export HTTPFS
 				;;
 
-			hostname=*)
-				HOSTNAME="${ARGUMENT#hostname=}"
-				LIVECONF="changed"
-				export HOSTNAME LIVECONF
-				;;
-
 			isofrom=*|fromiso=*)
 				FROMISO="${ARGUMENT#*=}"
 				export FROMISO
@@ -272,11 +249,6 @@ Arguments ()
 				export NOACCESSIBILITY
 				;;
 
-			noapparmor)
-				NOAPPARMOR="Yes"
-				export NOAPPARMOR
-				;;
-
 			noaptcdrom)
 				NOAPTCDROM="Yes"
 				export NOAPTCDROM
@@ -307,26 +279,11 @@ Arguments ()
 				export NOFSTAB
 				;;
 
-			nognomepanel)
-				NOGNOMEPANEL="Yes"
-				export NOGNOMEPANEL
-				;;
-
 			nohosts)
 				NOHOSTS="Yes"
 				export NOHOSTS
 				;;
 
-			nokpersonalizer)
-				NOKPERSONALIZER="Yes"
-				export NOKPERSONALIZER
-				;;
-
-			nolanguageselector)
-				NOLANGUAGESELECTOR="Yes"
-				export NOLANGUAGESELECTOR
-				;;
-
 			nolocales)
 				NOLOCALES="Yes"
 				export NOLOCALES
@@ -337,41 +294,11 @@ Arguments ()
 				export NONETWORKING
 				;;
 
-			nopowermanagement)
-				NOPOWERMANAGEMENT="Yes"
-				export NOPOWERMANAGEMENT
-				;;
-
-			noprogramcrashes)
-				NOPROGRAMCRASHES="Yes"
-				export NOPROGRAMCRASHES
-				;;
-
-			nojockey)
-				NOJOCKEY="Yes"
-				export NOJOCKEY
-				;;
-
-			nosudo)
-				NOSUDO="Yes"
-				export NOSUDO
-				;;
-
 			swapon)
 				SWAPON="Yes"
 				export SWAPON
 				;;
 
-			noupdatenotifier)
-				NOUPDATENOTIFIER="Yes"
-				export NOUPDATENOTIFIER
-				;;
-
-			nouser)
-				NOUSER="Yes"
-				export NOUSER
-				;;
-
 			noxautoconfig)
 				NOXAUTOCONFIG="Yes"
 				export NOXAUTOCONFIG
@@ -520,11 +447,6 @@ Arguments ()
 				export UNIONTYPE
 				;;
 
-			utc=*)
-				UTC="${ARGUMENT#utc=}"
-				export UTC
-				;;
-
 			xdebconf)
 				XDEBCONF="Yes"
 				export XDEBCONF
@@ -667,7 +589,7 @@ is_nice_device ()
 {
 	sysfs_path="${1#/sys}"
 
-	if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-|platform-orion-ehci|platform-mmc|platform-mxsdhci|)"
+	if /lib/udev/path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-|platform-orion-ehci|platform-mmc|platform-mxsdhci|)"
 	then
 		return 0
 	elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'
@@ -705,7 +627,7 @@ copy_live_to ()
 	if [ "${copytodev}" = "ram" ]
 	then
 		# copying to ram:
-		freespace=$( expr $(awk '/MemFree/{print $2}' /proc/meminfo) + $( awk '/\<Cached/{print $2}' /proc/meminfo ) )
+		freespace=$(awk '/^MemFree:/{f=$2} /^Cached:/{c=$2} END{print f+c}' /proc/meminfo)
 		mount_options="-o size=${size}k"
 		free_string="memory"
 		fstype="tmpfs"
@@ -759,7 +681,11 @@ copy_live_to ()
 				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
+				cp -a ${copyfrom}/${LIVE_MEDIA_PATH}/* ${copyto}/${LIVE_MEDIA_PATH}
+				if [ -e ${copyfrom}/${LIVE_MEDIA_PATH}/.disk ]
+				then
+					cp -a ${copyfrom}/${LIVE_MEDIA_PATH}/.disk ${copyto}
+				fi
 			fi
 		fi
 
@@ -1008,7 +934,7 @@ do_snap_copy ()
 			todev=$(awk -v pat="$(base_path ${todir})" '$2 == pat { print $1 }' /proc/mounts)
 			freespace=$(df -k | awk '/'${todev}'/{print $4}')
 		else
-			freespace=$( expr $(awk '/MemFree/{print $2}' /proc/meminfo) + $( awk '/\<Cached/{print $2}' /proc/meminfo))
+			freespace=$(awk '/^MemFree:/{f=$2} /^Cached:/{c=$2} END{print f+c}' /proc/meminfo)
 		fi
 
 		tomount="/mnt/tmpsnap"
@@ -1066,7 +992,7 @@ find_snap ()
 try_snap ()
 {
         # copy the contents of previously found snapshot to ${snap_mount}
-	# and remember the device and filename for resync on exit in live-initramfs.init
+	# and remember the device and filename for resync on exit in live-boot.init
 
 	snapdata="${1}"
 	snap_mount="${2}"
@@ -1677,7 +1603,7 @@ find_livefs ()
 
 	# or do the scan of block devices
 	# prefer removable devices over non-removable devices, so scan them first
-	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
+	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | egrep -v "/(loop|ram|dm-|fd)")
 	do
 		if [ "$(cat ${sysblock}/removable)" = "1" ]
 		then
@@ -1717,7 +1643,7 @@ find_livefs ()
 		then
 			# This is an ugly hack situation, the block device has
 			# an image directly on it.  It's hopefully
-			# live-initramfs, so take it and run with it.
+			# live-boot, so take it and run with it.
 			ln -s "${devname}" "${devname}.${fstype}"
 			echo "${devname}.${fstype}"
 			return 0
@@ -1885,6 +1811,13 @@ mountroot ()
 		mount -n -o bind /dev "${rootmnt}/dev"
 	fi
 
+	# Move to the new root filesystem so that programs there can get at it.
+	if [ ! -d /root/live/image ]
+	then
+		mkdir -p /root/live/image
+		mount --move /live/image /root/live/image
+	fi
+
 	maybe_break live-bottom
 	log_begin_msg "Running /scripts/live-bottom\n"