X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=1dcbc7425edc3df47dffd56243d7cad71d378d81;hb=b64e86e220b3313288a90d36c8b557e92bbd4ee5;hp=b1157c57d030b1722b83fa10c7e52df6e7a3a77b;hpb=1e0a488b895cd6e2bf7141aa730f17da42a490f7;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index b1157c5..1dcbc74 100755
--- a/scripts/live
+++ b/scripts/live
@@ -18,12 +18,11 @@ home_snapshot_label="home-sn"
 USERNAME="user"
 USERFULLNAME="Live user"
 HOSTNAME="host"
-BUILD_SYSTEM="Custom"
 
 mkdir -p "${mountpoint}"
 
 [ -f /etc/live.conf ] && . /etc/live.conf
-export USERNAME USERFULLNAME HOSTNAME BUILD_SYSTEM
+export USERNAME USERFULLNAME HOSTNAME
 
 . /scripts/live-helpers
 
@@ -46,7 +45,7 @@ Arguments ()
 
 			console=*)
 				DEFCONSOLE="${ARGUMENT#*=}"
-				export DEFCONFSOLE
+				export DEFCONSOLE
 				;;
 
 			debug)
@@ -79,6 +78,11 @@ Arguments ()
 				export USERFULLNAME LIVECONF
 				;;
 
+			ignore_uuid)
+				IGNORE_UUID="Yes"
+				export IGNORE_UUID
+				;;
+
 			ip=*)
 				STATICIP="${ARGUMENT#ip=}"
 
@@ -165,6 +169,11 @@ Arguments ()
 				export NFSOPTS
 				;;
 
+			nfscow=*)
+				NFS_COW="${ARGUMENT#nfscow=}"
+				export NFS_COW
+				;;
+
 			noaccessibility)
 				NOACCESSIBILITY="Yes"
 				export NOACCESSIBILITY
@@ -367,6 +376,11 @@ Arguments ()
 				export TORAM MODULETORAM
 				;;
 
+			exposedroot)
+				EXPOSED_ROOT="Yes"
+				export EXPOSED_ROOT
+				;;
+
 			union=*)
 				UNIONTYPE="${ARGUMENT#union=}"
 				export UNIONTYPE
@@ -434,6 +448,31 @@ is_live_path ()
 	return 1
 }
 
+matches_uuid ()
+{
+	if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]
+	then
+		return 0
+	fi
+
+	path="${1}"
+	uuid="$(cat /conf/uuid.conf)"
+
+	for try_uuid_file in "${mountpoint}/.disk/casper-uuid"*
+	do
+		[ -e "${try_uuid_file}" ] || continue
+
+		try_uuid="$(cat "${try_uuid_file}")"
+
+		if [ "${uuid}" = "${try_uuid}" ]
+		then
+			return 0
+		fi
+	done
+
+	return 1
+}
+
 get_backing_device ()
 {
 	case "${1}" in
@@ -588,7 +627,7 @@ do_netmount ()
 {
 	rc=1
 
-	modprobe "${MP_QUIET}" af_packet # For DHCP
+	modprobe -q af_packet # For DHCP
 
 	udevtrigger
 	udevsettle
@@ -658,7 +697,7 @@ do_nfsmount ()
 {
 	rc=1
 
-	modprobe "${MP_QUIET}" nfs
+	modprobe -q nfs
 
 	if [ -z "${NFSOPTS}" ]
 	then
@@ -691,7 +730,7 @@ do_cifsmount ()
 		fi
 
 		[ "${quiet}" != "y" ] && log_begin_msg "Trying mount.cifs ${NFSROOT} ${mountpoint} ${CIFSOPTS}"
-		modprobe "${MP_QUIET}" cifs
+		modprobe -q cifs
 
 		if mount.cifs "${NFSROOT}" "${mountpoint}" "${CIFSOPTS}"
 		then
@@ -831,7 +870,7 @@ setup_unionfs ()
 	image_directory="${1}"
 	rootmnt="${2}"
 
-	modprobe "${MP_QUIET}" -b ${UNIONTYPE}
+	modprobe -q -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,
@@ -915,8 +954,6 @@ setup_unionfs ()
 	rofsstring=${rofsstring%:}
 
 	mkdir -p /cow
-	cowdevice="tmpfs"
-	cow_fstype="tmpfs"
 
 	# Looking for "${root_persistence}" device or file
 	if [ -n "${PERSISTENT}" ]
@@ -930,11 +967,74 @@ setup_unionfs ()
 		else
 			[ "${quiet}" != "y" ] && log_warning_msg "Unable to find the persistent medium"
 		fi
+	elif [ -n "${NFS_COW}" ]
+	then
+		# check if there are any nfs options
+		if echo ${NFS_COW}|grep -q ','
+		then
+			nfs_cow_opts="-o nolock,$(echo ${NFS_COW}|cut -d, -f2-)"
+			nfs_cow=$(echo ${NFS_COW}|cut -d, -f1)
+		else
+			nfs_cow_opts="-o nolock"
+			nfs_cow=${NFS_COW}
+		fi
+		mac=$(get_mac)
+		if [ -n "${mac}" ]
+		then
+			cowdevice=$(echo ${nfs_cow}|sed "s/client_mac_address/${mac}/")
+			cow_fstype="nfs"
+		else
+			panic "unable to determine mac address"
+		fi
+	else
+		cowdevice="tmpfs"
+		cow_fstype="tmpfs"
+	fi
+
+	if [ "${cow_fstype}" = "nfs" ]
+	then
+		[ "${quiet}" != "y" ] && log_begin_msg \
+			"Trying nfsmount ${nfs_cow_opts} ${cowdevice} /cow"
+		nfsmount ${nfs_cow_opts} ${cowdevice} /cow || \
+			panic "Can not mount ${cowdevice} on /cow"
+	else
+		mount ${cowdevice} -t ${cow_fstype} -o rw,noatime /cow || \
+			panic "Can not mount ${cowdevice} on /cow"
 	fi
 
-	mount ${cowdevice} -t ${cow_fstype} -o rw,noatime /cow || panic "Can not mount ${cowdevice} on /cow"
+	rofscount=$(echo ${rofslist} |wc -w)
+
+	if [ -n "${EXPOSED_ROOT}" ]
+	then
+		if [ ${rofscount} -ne 1 ]
+		then
+			panic "only one RO file system supported with exposedroot: ${rofslist}"
+		fi
+		exposedrootfs=${rofslist%% }
+
+		mount --bind ${exposedrootfs} ${rootmnt} || \
+			panic "bind mount of ${exposedrootfs} failed"
+
+		cow_dirs='/var/tmp /var/lock /var/run /var/log /var/spool
+			/home /var/lib/live'
+
+		for dir in ${cow_dirs}; do
+			mkdir -p /cow${dir}
+			mount -t ${UNIONTYPE} \
+				-o rw,noatime,dirs=/cow${dir}=rw:${exposedrootfs}${dir}=ro \
+				${UNIONTYPE} "${rootmnt}${dir}" || \
+				panic "mount ${UNIONTYPE} on ${rootmnt}${dir} failed with option \
+					rw,noatime,dirs=/cow${dir}=rw:${exposedrootfs}${dir}=ro"
+		done
+	else
+		mount -t ${UNIONTYPE} -o noatime,dirs=/cow=rw:${rofsstring} \
+			${UNIONTYPE} "${rootmnt}" || panic "mount ${UNIONTYPE} on \
+			${rootmnt} failed with option noatime,dirs=/cow=rw:${rofsstring}"
+	fi
 
-	mount -t ${UNIONTYPE} -o noatime,dirs=/cow=rw:${rofsstring} ${UNIONTYPE} "${rootmnt}" || panic "${UNIONTYPE} mount failed"
+	# tmpfs file systems
+	mkdir -p "${rootmnt}/live"
+	mount -t tmpfs tmpfs ${rootmnt}/live
 
 	# Adding other custom mounts
 	if [ -n "${PERSISTENT}" ]
@@ -983,6 +1083,7 @@ check_dev ()
 {
 	sysdev="${1}"
 	devname="${2}"
+	skip_uuid_check="${3}"
 
 	if [ -z "${devname}" ]
 	then
@@ -1001,7 +1102,8 @@ check_dev ()
 	then
 		mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue
 
-		if is_live_path ${mountpoint}
+		if is_live_path ${mountpoint} && \
+			([ "${skip_uuid_check}" ] || matches_uuid ${mountpoint})
 		then
 			echo ${mountpoint}
 			return 0
@@ -1025,7 +1127,7 @@ find_livefs ()
 	# first look at the one specified in the command line
 	if [ ! -z "${LIVE_MEDIA}" ]
 	then
-		if check_dev "null" "${LIVE_MEDIA}"
+		if check_dev "null" "${LIVE_MEDIA}" "skip_uuid_check"
 		then
 			return 0
 		fi