X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=db1d355d0ccd38fe3c0c0c0987e4cd7dc5ab14c6;hb=refs%2Ftags%2Fdebian%2F1.157.3-1;hp=bf90781aef1642b82fd248e7ac2dc1d96b03f3f1;hpb=7cf718553bffafa216c4de61b5d3f4489587337f;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index bf90781..db1d355 100755
--- a/scripts/live
+++ b/scripts/live
@@ -345,6 +345,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
@@ -391,6 +398,11 @@ Arguments ()
 				export SHOWMOUNTS
 				;;
 
+			silent)
+				SILENT="Yes"
+				export SILENT
+				;;
+
 			textonly)
 				TEXTONLY="Yes"
 				export TEXTONLY
@@ -502,7 +514,7 @@ is_live_path ()
 
 	if [ -d "${DIRECTORY}"/"${LIVE_MEDIA_PATH}" ]
 	then
-		for FILESYSTEM in squashfs ext2 ext3 xfs dir jffs2
+		for FILESYSTEM in squashfs ext2 ext3 ext4 xfs dir jffs2
 		do
 			if [ "$(echo ${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM})" != "${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM}" ]
 			then
@@ -542,7 +554,7 @@ matches_uuid ()
 get_backing_device ()
 {
 	case "${1}" in
-		*.squashfs|*.ext2|*.ext3|*.jffs2)
+		*.squashfs|*.ext2|*.ext3|*.ext4|*.jffs2)
 			echo $(setup_loop "${1}" "loop" "/sys/block/loop*" '0' "${LIVE_MEDIA_ENCRYPTION}" "${2}")
 			;;
 
@@ -579,6 +591,7 @@ mount_images_in_directory ()
 	if match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.squashfs" ||
 		match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.ext2" ||
 		match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.ext3" ||
+		match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.ext4" ||
 		match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.jffs2" ||
 		match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.dir"
 	then
@@ -767,9 +780,11 @@ do_httpmount ()
 					then
 						case "$url" in
 							tftp*)
-								ip="$(dirname $url | sed -e 's|tftp://||g')"
-								log_begin_msg "Trying tftp -g -b 10240 -r $(basename ${url})  -l ${dest}/$(basename ${url}) $ip"
-								tftp -g -b 10240 -r $(basename ${url})  -l ${dest}/$(basename ${url}) $ip
+								ip="$(dirname $url | sed -e 's|tftp://||g' -e 's|/.*$||g')"
+								rfile="$(echo $url | sed -e "s|tftp://$ip||g")"
+								lfile="$(basename $url)"
+								log_begin_msg "Trying tftp -g -b 10240 -r $rfile -l ${dest}/$lfile $ip"
+								tftp -g -b 10240 -r $rfile -l ${dest}/$lfile $ip
 							;;
 
 							*)
@@ -919,7 +934,7 @@ find_snap ()
 	if [ "${PERSISTENT}" != "nofiles" ]
 	then
 		# search for image files
-		snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2 ${snap_label}.ext3 ${snap_label}.jffs2")
+		snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2 ${snap_label}.ext3 ${snap_label}.ext4 ${snap_label}.jffs2")
 	fi
 
 	if [ -z "${snapdata}" ]
@@ -938,7 +953,7 @@ try_snap ()
 	snap_mount="${2}"
 	snap_type="${3}"
 
-	if [ ! -z "${snapdata}" ]
+	if [ -n "${snapdata}" ] && [ ! -b "${snapdata}" ]
 	then
 		log_success_msg "found snapshot: ${snapdata}"
 		snapdev="$(echo ${snapdata} | cut -f1 -d ' ')"
@@ -951,9 +966,9 @@ try_snap ()
 			break
 		fi
 
-		if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\|ext3\|jffs2\)'
+		if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\|ext3\|ext4\|jffs2\)'
 		then
-			# squashfs, jffs2 or ext2/ext3 snapshot
+			# squashfs, jffs2 or ext2/ext3/ext4 snapshot
 			dev=$(get_backing_device "${snapback}/${snapfile}")
 
 			do_snap_copy "${dev}" "${snap_mount}" "${snap_type}"
@@ -977,12 +992,11 @@ try_snap ()
 			log_warning_msg "Impossible to include the ${snapfile} Snapshot file"
 		fi
 
-
 	elif [ -b "${snapdata}" ]
 	then
 		# Try to find if it could be a snapshot partition
 		dev="${snapdata}"
-		log_success_msg "found snapshot device on ${dev}"
+		log_success_msg "found snapshot ${snap_type} device on ${dev}"
 		if echo "${dev}" | grep -qs loop
 		then
 			# strange things happens, user confused?
@@ -1043,37 +1057,26 @@ setup_unionfs ()
 		roopt="ro"
 	fi
 
-	# Read image names from ${MODULE}.module if it exists
-	if [ -e "${image_directory}/filesystem.${MODULE}.module" ]
-	then
-		for IMAGE in $(cat ${image_directory}/filesystem.${MODULE}.module)
-		do
-			image_string="${image_string} ${image_directory}/${IMAGE}"
-		done
-	elif [ -e "${image_directory}/${MODULE}.module" ]
+	if [ -z "${PLAIN_ROOT}" ]
 	then
-		for IMAGE in $(cat ${image_directory}/${MODULE}.module)
-		do
-			image_string="${image_string} ${image_directory}/${IMAGE}"
-		done
-	else
-		# ${MODULE}.module does not exist, create a list of images
-		for FILESYSTEM in squashfs ext2 ext3 xfs jffs2 dir
-		do
-			for IMAGE in "${image_directory}"/*."${FILESYSTEM}"
+		# Read image names from ${MODULE}.module if it exists
+		if [ -e "${image_directory}/filesystem.${MODULE}.module" ]
+		then
+			for IMAGE in $(cat ${image_directory}/filesystem.${MODULE}.module)
 			do
-				if [ -e "${IMAGE}" ]
-				then
-					image_string="${image_string} ${IMAGE}"
-				fi
+				image_string="${image_string} ${image_directory}/${IMAGE}"
 			done
-		done
-
-		if [ -n "${addimage_directory}" ] && [ -d "${addimage_directory}" ]
+		elif [ -e "${image_directory}/${MODULE}.module" ]
 		then
-			for FILESYSTEM in squashfs ext2 ext3 xfs jffs2 dir
+			for IMAGE in $(cat ${image_directory}/${MODULE}.module)
 			do
-				for IMAGE in "${addimage_directory}"/*."${FILESYSTEM}"
+				image_string="${image_string} ${image_directory}/${IMAGE}"
+			done
+		else
+			# ${MODULE}.module does not exist, create a list of images
+			for FILESYSTEM in squashfs ext2 ext3 ext4 xfs jffs2 dir
+			do
+				for IMAGE in "${image_directory}"/*."${FILESYSTEM}"
 				do
 					if [ -e "${IMAGE}" ]
 					then
@@ -1081,58 +1084,80 @@ setup_unionfs ()
 					fi
 				done
 			done
-		fi
 
-		# Now sort the list
-		image_string="$(echo ${image_string} | sed -e 's/ /\n/g' | sort )"
-	fi
+			if [ -n "${addimage_directory}" ] && [ -d "${addimage_directory}" ]
+			then
+				for FILESYSTEM in squashfs ext2 ext3 ext4 xfs jffs2 dir
+				do
+					for IMAGE in "${addimage_directory}"/*."${FILESYSTEM}"
+					do
+						if [ -e "${IMAGE}" ]
+						then
+							image_string="${image_string} ${IMAGE}"
+						fi
+					done
+				done
+			fi
+
+			# Now sort the list
+			image_string="$(echo ${image_string} | sed -e 's/ /\n/g' | sort )"
+		fi
 
 	[ -n "${MODULETORAMFILE}" ] && image_string="${image_directory}/$(basename ${MODULETORAMFILE})"
 
-	mkdir -p "${croot}"
+		mkdir -p "${croot}"
 
-	for image in ${image_string}
-	do
-		imagename=$(basename "${image}")
+		for image in ${image_string}
+		do
+			imagename=$(basename "${image}")
 
-		export image devname
-		maybe_break live-realpremount
-		log_begin_msg "Running /scripts/live-realpremount"
-		run_scripts /scripts/live-realpremount
-		log_end_msg
+			export image devname
+			maybe_break live-realpremount
+			log_begin_msg "Running /scripts/live-realpremount"
+			run_scripts /scripts/live-realpremount
+			log_end_msg
 
-		if [ -d "${image}" ]
-		then
-			# it is a plain directory: do nothing
-			rofsstring="${image}=${roopt}:${rofsstring}"
-			rofslist="${image} ${rofslist}"
-		elif [ -f "${image}" ]
-		then
-			if losetup --help 2>&1 | grep -q -- "-r\b"
+			if [ -d "${image}" ]
 			then
-				backdev=$(get_backing_device "${image}" "-r")
-			else
-				backdev=$(get_backing_device "${image}")
-			fi
-			fstype=$(get_fstype "${backdev}")
-
-			if [ "${fstype}" = "unknown" ]
+				# it is a plain directory: do nothing
+				rofsstring="${image}=${roopt}:${rofsstring}"
+				rofslist="${image} ${rofslist}"
+			elif [ -f "${image}" ]
 			then
-				panic "Unknown file system type on ${backdev} (${image})"
-			fi
+				if losetup --help 2>&1 | grep -q -- "-r\b"
+				then
+					backdev=$(get_backing_device "${image}" "-r")
+				else
+					backdev=$(get_backing_device "${image}")
+				fi
+				fstype=$(get_fstype "${backdev}")
 
-			if [ -z "${fstype}" ]
-			then
-				fstype="${imagename##*.}"
-				log_warning_msg "Unknown file system type on ${backdev} (${image}), assuming ${fstype}."
-			fi
+				if [ "${fstype}" = "unknown" ]
+				then
+					panic "Unknown file system type on ${backdev} (${image})"
+				fi
 
-			mkdir -p "${croot}/${imagename}"
-			log_begin_msg "Mounting \"${image}\" on \"${croot}${imagename}\" via \"${backdev}\""
-			mount -t "${fstype}" -o ro,noatime "${backdev}" "${croot}/${imagename}" || panic "Can not mount ${backdev} (${image}) on ${croot}/${imagename}" && rofsstring="${croot}/${imagename}=${roopt}:${rofsstring}" && rofslist="${croot}/${imagename} ${rofslist}"
-			log_end_msg
-		fi
-	done
+				if [ -z "${fstype}" ]
+				then
+					fstype="${imagename##*.}"
+					log_warning_msg "Unknown file system type on ${backdev} (${image}), assuming ${fstype}."
+				fi
+
+				mkdir -p "${croot}/${imagename}"
+				log_begin_msg "Mounting \"${image}\" on \"${croot}${imagename}\" via \"${backdev}\""
+				mount -t "${fstype}" -o ro,noatime "${backdev}" "${croot}/${imagename}" || panic "Can not mount ${backdev} (${image}) on ${croot}/${imagename}" && rofsstring="${croot}/${imagename}=${roopt}:${rofsstring}" && rofslist="${croot}/${imagename} ${rofslist}"
+				log_end_msg
+			fi
+		done
+	else
+		# we have a plain root system
+		mkdir -p "${croot}/filesystem"
+		log_begin_msg "Mounting \"${image_directory}\" on \"${croot}/filesystem\""
+		mount -t $(get_fstype "${image_directory}") -o ro,noatime "${image_directory}" "${croot}/filesystem" || panic "Can not mount ${image_directory} on ${croot}/filesystem" && rofsstring="${croot}/filesystem=${roopt}:${rofsstring}" && rofslist="${croot}/filesystem ${rofslist}"
+		# probably broken:
+		mount -o bind ${croot}/filesystem $mountpoint
+		log_end_msg
+	fi
 
 	rofsstring=${rofsstring%:}
 
@@ -1195,7 +1220,7 @@ setup_unionfs ()
 		root_snapdata=$(find_snap "${root_snapshot_label}" "${blacklistdev}")
 		# 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.
+		# ext2|ext3|ext4|jffs2 snapshot types.
 		home_snapdata=$(find_snap "${home_snapshot_label}" "${blacklistdev}")
 
 		if [ -b "${cowprobe}" ]
@@ -1279,6 +1304,9 @@ setup_unionfs ()
 			${rootmnt} failed with option noatime,dirs=/cow=rw:${rofsstring}"
 	fi
 
+	# Correct the permissions of /:
+	chmod 0755 "${rootmnt}"
+
 	# tmpfs file systems
 	touch /etc/fstab
 	mkdir -p "${rootmnt}/live"
@@ -1385,15 +1413,6 @@ find_livefs ()
 {
 	timeout="${1}"
 
-	# first look at the one specified in the command line
-	if [ ! -z "${LIVE_MEDIA}" ]
-	then
-		if check_dev "null" "${LIVE_MEDIA}" "skip_uuid_check"
-		then
-			return 0
-		fi
-	fi
-
 	# don't start autodetection before timeout has expired
 	if [ -n "${LIVE_MEDIA_TIMEOUT}" ]
 	then
@@ -1403,6 +1422,55 @@ find_livefs ()
 		fi
 	fi
 
+	# first look at the one specified in the command line
+	case "${LIVE_MEDIA}" in
+		removable-usb)
+			for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
+			do
+				if [ "$(cat ${sysblock}/removable)" = "1" ]
+				then
+					if readlink ${sysblock} | grep -q usb ||
+					   readlink ${sysblock}/device | grep -q usb # linux < 2.6.29
+					then
+						for dev in $(subdevices "${sysblock}")
+						do
+							if check_dev "${dev}"
+							then
+								return 0
+							fi
+						done
+					fi
+				fi
+			done
+			;;
+
+		removable)
+			for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
+			do
+				if [ "$(cat ${sysblock}/removable)" = "1" ]
+				then
+					for dev in $(subdevices "${sysblock}")
+					do
+						if check_dev "${dev}"
+						then
+							return 0
+						fi
+					done
+				fi
+			done
+			;;
+
+		*)
+			if [ ! -z "${LIVE_MEDIA}" ]
+			then
+				if check_dev "null" "${LIVE_MEDIA}" "skip_uuid_check"
+				then
+					return 0
+				fi
+			fi
+			;;
+	esac
+
 	# or do the scan of block devices
 	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
 	do
@@ -1427,6 +1495,7 @@ find_livefs ()
 		elif [ "${fstype}" = "squashfs" -o \
 			"${fstype}" = "ext2" -o \
 			"${fstype}" = "ext3" -o \
+			"${fstype}" = "ext4" -o \
 			"${fstype}" = "jffs2" ]
 		then
 			# This is an ugly hack situation, the block device has
@@ -1563,7 +1632,7 @@ mountroot ()
 		log_end_msg
 	fi
 
-	if [ -n "${MODULETORAMFILE}" ]
+	if [ -n "${MODULETORAMFILE}" ] || [ -n "${PLAIN_ROOT}" ]
 	then
 		setup_unionfs "${livefs_root}" "${rootmnt}"
 	else
@@ -1583,5 +1652,5 @@ mountroot ()
 	exec 1>&6 6>&-
 	exec 2>&7 7>&-
 	kill ${tailpid}
-	cp live.log "${rootmnt}/var/log/"
+	[ -w "${rootmnt}/var/log/" ] && cp live.log "${rootmnt}/var/log/" 2>/dev/null
 }