X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=bf20ffc98f9a8c8ab2ca0aaf77bf39823ddaa4d2;hb=78ba9317d08612a3ab6b838e03240dc48be9c9f6;hp=8761138c0842bcc72fc978a953708d87f675c4a5;hpb=a4b49df943941b4c9feb1acb97d0a2a5d3c723b7;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 8761138..bf20ffc 100755
--- a/scripts/live
+++ b/scripts/live
@@ -286,9 +286,9 @@ Arguments ()
 				export NOPROGRAMCRASHES
 				;;
 
-			norestrictedmanager)
-				NORESTRICTEDMANAGER="Yes"
-				export NORESTRICTEDMANAGER
+			nojockey)
+				NOJOCKEY="Yes"
+				export NOJOCKEY
 				;;
 
 			nosudo)
@@ -509,7 +509,7 @@ matches_uuid ()
 	path="${1}"
 	uuid="$(cat /conf/uuid.conf)"
 
-	for try_uuid_file in "${mountpoint}/.disk/live-uuid"*
+	for try_uuid_file in "${path}/.disk/live-uuid"*
 	do
 		[ -e "${try_uuid_file}" ] || continue
 
@@ -578,7 +578,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-[^-]*-(ide|scsi|usb))"
 	then
 		return 0
 	elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'
@@ -613,7 +613,7 @@ copy_live_to ()
 	if [ "${copytodev}" = "ram" ]
 	then
 		# copying to ram:
-		freespace=$( expr $(awk '/MemFree/{print $2}' /proc/meminfo) + $( cat /proc/meminfo | grep Cached | head -n 1 | awk '/Cached/{print $2}' - ) )
+		freespace=$( expr $(awk '/MemFree/{print $2}' /proc/meminfo) + $( awk '/\<Cached/{print $2}' /proc/meminfo ) )
 		mount_options="-o size=${size}k"
 		free_string="memory"
 		fstype="tmpfs"
@@ -799,11 +799,13 @@ do_nfsmount ()
 
 	log_begin_msg "Trying nfsmount -o nolock -o ro ${NFSOPTS} ${NFSROOT} ${mountpoint}"
 
-	# FIXME: This for loop is an ugly HACK round an nfs bug
-	for i in 0 1 2 3 4 5 6 7 8 9 a b c d e f 10 11 12 13
+	# FIXME: This while loop is an ugly HACK round an nfs bug
+	i=0
+	while [ "$i" -lt 60 ]
 	do
 		nfsmount -o nolock -o ro ${NFSOPTS} "${NFSROOT}" "${mountpoint}" && rc=0 && break
 		sleep 1
+		i="$(($i + 1))"
 	done
 
 	return ${rc}
@@ -846,10 +848,10 @@ do_snap_copy ()
 		# look for free mem
 		if [ -n "${HOMEMOUNTED}" -a "${snap_type}" = "HOME" ]
 		then
-			todev=$(cat /proc/mounts | grep -s " $(base_path ${todir}) " | awk '{print $1}' )
-			freespace=$(df -k  | grep -s ${todev} | awk '{print $4}')
+			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) + $( cat /proc/meminfo | grep Cached | head -n 1 | awk '/Cached/{print $2}' - ))
+			freespace=$( expr $(awk '/MemFree/{print $2}' /proc/meminfo) + $( awk '/\<Cached/{print $2}' /proc/meminfo))
 		fi
 
 		tomount="/mnt/tmpsnap"
@@ -963,7 +965,7 @@ try_snap ()
 			# strange things happens, user confused?
 			snaploop=$( losetup ${dev} | awk '{print $3}' | tr -d '()' )
 			snapfile=$(basename ${snaploop})
-			snapdev=$(cat /proc/mounts | awk '{print $2,$1}' | grep -es "^$( dirname ${snaploop} )" | cut -f2 -d ' ')
+			snapdev=$(awk -v pat="$( dirname ${snaploop})" '$2 == pat { print $1 }' /proc/mounts)
 		else
 			snapdev="${dev}"
 		fi
@@ -1151,11 +1153,20 @@ setup_unionfs ()
 			# snapshots to be sure to really store some e.g key config files,
 			# but not on the same media
 			blacklistdev="${cowprobe}"
+			PERSISTENCE_IS_ON="1"
+			export PERSISTENCE_IS_ON
 		fi
 		# homecow just mount something on /home, this should be generalized some way
 		homecow=$(find_cow_device "${home_persistence}" "${blacklistdev}")
+		if [ -b "${homecow}" ]
+		then
+			PERSISTENCE_IS_ON="1"
+			export PERSISTENCE_IS_ON
+		fi
 		root_snapdata=$(find_snap "${root_snapshot_label}" "${blacklistdev}")
-		# This second type should be removed when snapshot grow smarter
+		# This second type should be removed when snapshot will get smarter,
+		# hence when "/etc/live-snapshot*list" will be supported also by
+		# ext2|ext3|jffs2 snapshot types.
 		home_snapdata=$(find_snap "${home_snapshot_label}" "${blacklistdev}")
 
 		if [ -b "${cowprobe}" ]
@@ -1360,7 +1371,7 @@ find_livefs ()
 	fi
 
 	# or do the scan of block devices
-	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v 'dm-' | grep -v fd )
+	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
 	do
 		devname=$(sys2dev "${sysblock}")
 		fstype=$(get_fstype "${devname}")
@@ -1452,7 +1463,8 @@ mountroot ()
 			livefs_root=${ROOT}
 		else
 			# Scan local devices for the image
-			for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
+			i=0
+			while [ "$i" -lt 60 ]
 			do
 				livefs_root=$(find_livefs ${i})
 
@@ -1462,6 +1474,7 @@ mountroot ()
 				fi
 
 				sleep 1
+				i="$(($i + 1))"
 			done
 		fi
 	fi