X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=0443e3585f9f94328117c91563aeeb6e7831a4ef;hb=cabcd3723fc124a3816f7e992912189e65c7b382;hp=7e748dcf68be3254aa15eec2a1a392214c6a93de;hpb=84c4bb48d54a2be450bac5a5cf49e4b513e5b5b0;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 7e748dc..0443e35 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)
@@ -170,6 +169,11 @@ Arguments ()
 				export NFSOPTS
 				;;
 
+			nfscow=*)
+				NFS_COW="${ARGUMENT#nfscow=}"
+				export NFS_COW
+				;;
+
 			noaccessibility)
 				NOACCESSIBILITY="Yes"
 				export NOACCESSIBILITY
@@ -372,6 +376,11 @@ Arguments ()
 				export TORAM MODULETORAM
 				;;
 
+			exposedroot)
+				EXPOSED_ROOT="Yes"
+				export EXPOSED_ROOT
+				;;
+
 			union=*)
 				UNIONTYPE="${ARGUMENT#union=}"
 				export UNIONTYPE
@@ -427,7 +436,7 @@ is_live_path ()
 
 	if [ -d "${DIRECTORY}"/"${LIVE_MEDIA_PATH}" ]
 	then
-		for FILESYSTEM in squashfs ext2 ext3 xfs dir
+		for FILESYSTEM in squashfs ext2 ext3 xfs dir jffs2
 		do
 			if [ "$(echo ${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM})" != "${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM}" ]
 			then
@@ -467,7 +476,7 @@ matches_uuid ()
 get_backing_device ()
 {
 	case "${1}" in
-		*.squashfs|*.ext2|*.ext3)
+		*.squashfs|*.ext2|*.ext3|*.jffs2)
 			echo $(setup_loop "${1}" "loop" "/sys/block/loop*" '0' "${LIVE_MEDIA_ENCRYPTION}")
 			;;
 
@@ -498,13 +507,17 @@ mount_images_in_directory ()
 {
 	directory="${1}"
 	rootmnt="${2}"
+    	mac="${3}"
+
 
 	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}/*.jffs2" ||
 		match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.dir"
 	then
-		setup_unionfs "${directory}/${LIVE_MEDIA_PATH}" "${rootmnt}"
+		[ -n "${mac}" ] && adddirectory="${directory}/${LIVE_MEDIA_PATH}/${mac}"
+		setup_unionfs "${directory}/${LIVE_MEDIA_PATH}" "${rootmnt}" "${adddirectory}"
 	else
 		:
 	fi
@@ -528,7 +541,7 @@ is_supported_fs ()
 	fstype="${1}"
 
 	case ${fstype} in
-		vfat|iso9660|udf|ext2|ext3|ntfs)
+		vfat|iso9660|udf|ext2|ext3|ntfs|jffs2)
 			return 0
 			;;
 	esac
@@ -618,7 +631,7 @@ do_netmount ()
 {
 	rc=1
 
-	modprobe "${MP_QUIET}" af_packet # For DHCP
+	modprobe -q af_packet # For DHCP
 
 	udevtrigger
 	udevsettle
@@ -688,7 +701,7 @@ do_nfsmount ()
 {
 	rc=1
 
-	modprobe "${MP_QUIET}" nfs
+	modprobe -q nfs
 
 	if [ -z "${NFSOPTS}" ]
 	then
@@ -721,7 +734,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
@@ -762,7 +775,7 @@ do_snap_copy ()
 		if [ -n "${fstype}" ]
 		then
 			# Copying stuff...
-			mount -t "${fstype}" -o ro,noatime,nodiratime "${fromdev}" "${tomount}"
+			mount -t "${fstype}" -o ro,noatime "${fromdev}" "${tomount}"
 			cp -a "${tomount}"/* ${todir}
 			umount "${tomount}"
 		else
@@ -792,7 +805,7 @@ try_snap ()
 	snap_label="${1}"
 	snap_mount="${2}"
 	snap_type="${3}"
-	snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2 ${snap_label}.ext3")
+	snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2 ${snap_label}.ext3 ${snap_label}.jffs2")
 
 	if [ ! -z "${snapdata}" ]
 	then
@@ -800,9 +813,9 @@ try_snap ()
 		snapback="$(echo ${snapdata} | cut -f2 -d ' ')"
 		snapfile="$(echo ${snapdata} | cut -f3 -d ' ')"
 
-		if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\|ext3\)'
+		if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\|ext3\|jffs2\)'
 		then
-			# squashfs or ext2/ext3 snapshot
+			# squashfs, jffs2 or ext2/ext3 snapshot
 			dev=$(get_backing_device "${snapback}/${snapfile}")
 
 			if ! do_snap_copy "${dev}" "${snap_mount}" "${snap_type}"
@@ -860,8 +873,8 @@ setup_unionfs ()
 {
 	image_directory="${1}"
 	rootmnt="${2}"
-
-	modprobe "${MP_QUIET}" -b ${UNIONTYPE}
+        addimage_directory="${3}"
+	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,
@@ -898,7 +911,7 @@ setup_unionfs ()
 		done
 	else
 		# ${MODULE}.module does not exist, create a list of images
-		for FILESYSTEM in squashfs ext2 ext3 xfs dir
+		for FILESYSTEM in squashfs ext2 ext3 xfs jffs2 dir
 		do
 			for IMAGE in "${image_directory}"/*."${FILESYSTEM}"
 			do
@@ -909,6 +922,20 @@ setup_unionfs ()
 			done
 		done
 
+		if [ -n "${addimage_directory}" ] && [ -d "${addimage_directory}" ]
+		then
+			for FILESYSTEM in squashfs ext2 ext3 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
@@ -938,15 +965,13 @@ setup_unionfs ()
 
 			mkdir -p "${croot}/${imagename}"
 			echo "debug: Can not mount backdev ${backdev} (image = ${image}) on croot/imagename ${croot}/${imagename}"
-			mount -t "${fstype}" -o ro,noatime,nodiratime "${backdev}" "${croot}/${imagename}" || panic "Can not mount ${backdev} (${image}) on ${croot}/${imagename}" && rofsstring="${croot}/${imagename}=${roopt}:${rofsstring}" && rofslist="${croot}/${imagename} ${rofslist}"
+			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}"
 		fi
 	done
 
 	rofsstring=${rofsstring%:}
 
 	mkdir -p /cow
-	cowdevice="tmpfs"
-	cow_fstype="tmpfs"
 
 	# Looking for "${root_persistence}" device or file
 	if [ -n "${PERSISTENT}" ]
@@ -959,12 +984,77 @@ setup_unionfs ()
 			cow_fstype=$(get_fstype "${cowprobe}")
 		else
 			[ "${quiet}" != "y" ] && log_warning_msg "Unable to find the persistent medium"
+			cowdevice="tmpfs"
+			cow_fstype="tmpfs"
+		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
 
-	mount ${cowdevice} -t ${cow_fstype} -o rw,noatime,nodiratime /cow || panic "Can not mount ${cowdevice} on /cow"
+	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
+
+	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"
 
-	mount -t ${UNIONTYPE} -o noatime,nodiratime,dirs=/cow=rw:${rofsstring} ${UNIONTYPE} "${rootmnt}" || panic "${UNIONTYPE} mount 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
+
+	# tmpfs file systems
+	mkdir -p "${rootmnt}/live"
+	mount -t tmpfs tmpfs ${rootmnt}/live
 
 	# Adding other custom mounts
 	if [ -n "${PERSISTENT}" ]
@@ -975,7 +1065,7 @@ setup_unionfs ()
 
 		if [ -b "${homecow}" ]
 		then
-			mount -t $(get_fstype "${homecow}") -o rw,noatime,nodiratime "${homecow}" "${rootmnt}/home"
+			mount -t $(get_fstype "${homecow}") -o rw,noatime "${homecow}" "${rootmnt}/home"
 			export HOMEMOUNTED=1 # used to proper calculate free space in do_snap_copy()
 		else
 			[ "${quiet}" != "y" ] && log_warning_msg "Unable to find the persistent home medium"
@@ -1030,7 +1120,7 @@ check_dev ()
 
 	if is_supported_fs ${fstype}
 	then
-		mount -t ${fstype} -o ro,noatime,nodiratime "${devname}" ${mountpoint} || continue
+		mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue
 
 		if is_live_path ${mountpoint} && \
 			([ "${skip_uuid_check}" ] || matches_uuid ${mountpoint})
@@ -1095,7 +1185,8 @@ find_livefs ()
 			done
 		elif [ "${fstype}" = "squashfs" -o \
 			"${fstype}" = "ext2" -o \
-			"${fstype}" = "ext3" ]
+			"${fstype}" = "ext3" -o \
+			"${fstype}" = "jffs2" ]
 		then
 			# This is an ugly hack situation, the block device has
 			# an image directly on it.  It's hopefully
@@ -1109,14 +1200,6 @@ find_livefs ()
 	return 1
 }
 
-pulsate ()
-{
-	if [ -x /sbin/usplash_write ]
-	then
-		/sbin/usplash_write "PULSATE"
-	fi
-}
-
 set_usplash_timeout ()
 {
 	if [ -x /sbin/usplash_write ]
@@ -1136,7 +1219,6 @@ mountroot ()
 
 	set_usplash_timeout
 	[ "${quiet}" != "y" ] && log_begin_msg "Running /scripts/live-premount"
-	pulsate
 	run_scripts /scripts/live-premount
 	[ "${quiet}" != "y" ] && log_end_msg
 
@@ -1192,7 +1274,9 @@ mountroot ()
 	then
 		setup_unionfs "${livefs_root}" "${rootmnt}"
 	else
-		mount_images_in_directory "${livefs_root}" "${rootmnt}"
+		mac="$(get_mac)"
+		mac="$(echo ${mac} | sed 's/-//g')"
+		mount_images_in_directory "${livefs_root}" "${rootmnt}" "${mac}"
 	fi
 
 	log_end_msg
@@ -1200,7 +1284,6 @@ mountroot ()
 	maybe_break live-bottom
 	[ "${quiet}" != "y" ] && log_begin_msg "Running /scripts/live-bottom"
 
-	pulsate
 	run_scripts /scripts/live-bottom
 	[ "${quiet}" != "y" ] && log_end_msg