X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=56813626bd93ec0878b446d6232990b407dc25eb;hb=2ad3c30d9ef0cc1ea2c7df7e7f0862c4dc6dad5d;hp=ad2d48e243097a04176fb06f733a02dee5980f9f;hpb=6d73f92bf923d3f102f0bc1213c94b6227e804a0;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index ad2d48e..5681362 100755
--- a/scripts/live
+++ b/scripts/live
@@ -102,9 +102,9 @@ Arguments ()
 				;;
 
 			fetch=*)
-                                FETCH="${ARGUMENT#fetch=}"
-                                export FETCH
-                                ;;
+				FETCH="${ARGUMENT#fetch=}"
+				export FETCH
+				;;
 
 			forcepersistentfsck)
 				FORCEPERSISTENTFSCK="Yes"
@@ -119,7 +119,7 @@ Arguments ()
 			httpfs=*)
 				HTTPFS="${ARGUMENT#httpfs=}"
 				export HTTPFS
-                                ;;
+				;;
 
 			iscsi=*)
 				ISCSI="${ARGUMENT#iscsi=}"
@@ -230,6 +230,10 @@ Arguments ()
 				export NONETWORKING
 				;;
 
+			ramdisk-size=*)
+				ramdisk_size="${ARGUMENT#ramdisk-size=}"
+				;;
+
 			swapon)
 				SWAPON="Yes"
 				export SWAPON
@@ -266,6 +270,16 @@ Arguments ()
 				export NOPERSISTENT
 				;;
 
+			noprompt)
+				NOPROMPT="Yes"
+				export NOPROMPT
+				;;
+
+			noprompt=*)
+				NOPROMPT="${ARGUMENT#noprompt=}"
+				export NOPROMPT
+				;;
+
 			quickusbmodules)
 				QUICKUSBMODULES="Yes"
 				export QUICKUSBMODULES
@@ -325,9 +339,9 @@ Arguments ()
 				;;
 
 			skipunion)
-                                SKIP_UNION_MOUNTS="Yes"
-                                export SKIP_UNION_MOUNTS
-                                ;;
+				SKIP_UNION_MOUNTS="Yes"
+				export SKIP_UNION_MOUNTS
+				;;
 
 			root=*)
 				ROOT="${ARGUMENT#root=}"
@@ -475,6 +489,9 @@ is_nice_device ()
 	elif echo ${sysfs_path} | grep -q "^/block/dm-"
 	then
 		return 0
+	elif echo ${sysfs_path} | grep -q "^/block/mtdblock"
+	then
+		return 0
 	fi
 
 	return 1
@@ -529,6 +546,13 @@ copy_live_to ()
 		return 1
 	fi
 
+	# Custom ramdisk size
+	if [ -z "${mount_options}" ] && [ -n "${ramdisk_size}" ]
+	then
+		# FIXME: should check for wrong values
+		mount_options="-o size=${ramdisk_size}"
+	fi
+
 	# begin copying (or uncompressing)
 	mkdir "${copyto}"
 	log_begin_msg "mount -t ${fstype} ${mount_options} ${dev} ${copyto}"
@@ -706,12 +730,15 @@ do_netsetup ()
 			if [ -n "${DNSDOMAIN}" ]
 			then
 				echo "domain ${DNSDOMAIN}" > /etc/resolv.conf
-				echo "search ${DNSDOMAIN}" > /etc/resolv.conf
+				echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
 			fi
 
 			for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1}
 			do
-				echo "nameserver $i" >> /etc/resolv.conf
+				if [ -n "$i" ] && [ "$i" != 0.0.0.0 ]
+				then
+					echo "nameserver $i" >> /etc/resolv.conf
+				fi
 			done
 		fi
 
@@ -774,7 +801,7 @@ do_iscsi()
 	[ "${DEBUG}" == "Yes" ] && debugopt="-d 8"
 	#FIXME this name is supposed to be unique - some date + ifconfig hash?
 	ISCSI_INITIATORNAME="iqn.1993-08.org.debian.live:01:$(echo "${HWADDR}" | sed -e s/://g)"
-        export ISCSI_INITIATORNAME
+	export ISCSI_INITIATORNAME
 	if [ -n "${ISCSI_SERVER}" ] ; then
 		iscsistart $debugopt -i "${ISCSI_INITIATORNAME}" -t "${ISCSI_TARGET}" -g 1 -a "${ISCSI_SERVER}" -p "${ISCSI_PORT}"
 	else
@@ -1022,7 +1049,7 @@ find_snap ()
 
 try_snap ()
 {
-        # copy the contents of previously found snapshot to ${snap_mount}
+	# copy the contents of previously found snapshot to ${snap_mount}
 	# and remember the device and filename for resync on exit in live-boot.init
 
 	snapdata="${1}"
@@ -1138,7 +1165,7 @@ setup_unionfs ()
 {
 	image_directory="${1}"
 	rootmnt="${2}"
-        addimage_directory="${3}"
+	addimage_directory="${3}"
 
 	case ${UNIONTYPE} in
 		aufs|unionfs)
@@ -1167,7 +1194,6 @@ setup_unionfs ()
 	croot="/"
 
 	# Let's just mount the read-only file systems first
-	rofsstring=""
 	rofslist=""
 
 	if [ "${UNIONTYPE}" = "aufs" ]
@@ -1227,7 +1253,7 @@ setup_unionfs ()
 			image_string="$(echo ${image_string} | sed -e 's/ /\n/g' | sort )"
 		fi
 
-	[ -n "${MODULETORAMFILE}" ] && image_string="${image_directory}/$(basename ${MODULETORAMFILE})"
+		[ -n "${MODULETORAMFILE}" ] && image_string="${image_directory}/$(basename ${MODULETORAMFILE})"
 
 		mkdir -p "${croot}"
 
@@ -1244,7 +1270,6 @@ setup_unionfs ()
 			if [ -d "${image}" ]
 			then
 				# it is a plain directory: do nothing
-				rofsstring="${image}=${roopt}:${rofsstring}"
 				rofslist="${image} ${rofslist}"
 			elif [ -f "${image}" ]
 			then
@@ -1267,9 +1292,17 @@ setup_unionfs ()
 					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}"
+				if [ "${UNIONTYPE}" != "unionmount" ]
+				then
+					mpoint="${croot}/${imagename}"
+					rofslist="${mpoint} ${rofslist}"
+				else
+					mpoint="${rootmnt}"
+					rofslist="${rootmnt} ${rofslist}"
+				fi
+				mkdir -p "${mpoint}"
+				log_begin_msg "Mounting \"${image}\" on \"${mpoint}\" via \"${backdev}\""
+				mount -t "${fstype}" -o ro,noatime "${backdev}" "${mpoint}" || panic "Can not mount ${backdev} (${image}) on ${mpoint}"
 				log_end_msg
 			fi
 		done
@@ -1277,14 +1310,14 @@ setup_unionfs ()
 		# 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}"
+		mount -t $(get_fstype "${image_directory}") -o ro,noatime "${image_directory}" "${croot}/filesystem" || \
+			panic "Can not mount ${image_directory} on ${croot}/filesystem" && \
+			rofslist="${croot}/filesystem ${rofslist}"
 		# probably broken:
 		mount -o bind ${croot}/filesystem $mountpoint
 		log_end_msg
 	fi
 
-	rofsstring=${rofsstring%:}
-
 	mkdir -p /cow
 
 	# Looking for "${root_persistence}" device or file
@@ -1383,29 +1416,33 @@ setup_unionfs ()
 		cow_mountopt="rw,noatime,mode=755"
 	fi
 
-	if [ "${cow_fstype}" = "nfs" ]
+	if [ "${UNIONTYPE}" != "unionmount" ]
 	then
-		log_begin_msg \
-			"Trying nfsmount ${nfs_cow_opts} ${cowdevice} /cow"
-		nfsmount ${nfs_cow_opts} ${cowdevice} /cow || \
-			panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on /cow"
-	else
-		mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} /cow || \
-			panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on /cow"
+
+		if [ "${cow_fstype}" = "nfs" ]
+		then
+			log_begin_msg \
+				"Trying nfsmount ${nfs_cow_opts} ${cowdevice} /cow"
+			nfsmount ${nfs_cow_opts} ${cowdevice} /cow || \
+				panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on /cow"
+		else
+			mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} /cow || \
+				panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on /cow"
+		fi
 	fi
 
 	rofscount=$(echo ${rofslist} |wc -w)
 
-	if [ -n "${EXPOSED_ROOT}" ]
+	if [ ${rofscount} -ne 1 ]
 	then
-		if [ ${rofscount} -ne 1 ]
-		then
-			panic "only one RO file system supported with exposedroot: ${rofslist}"
-		fi
-		exposedrootfs=${rofslist%% }
+		panic "only one RO file system supported with exposedroot: ${rofslist}"
+	fi
+	rofs=${rofslist%% }
 
-		mount --bind ${exposedrootfs} ${rootmnt} || \
-			panic "bind mount of ${exposedrootfs} failed"
+	if [ -n "${EXPOSED_ROOT}" ]
+	then
+		mount --bind ${rofs} ${rootmnt} || \
+			panic "bind mount of ${rofs} failed"
 
 		if [ -z "${SKIP_UNION_MOUNTS}" ]
 		then
@@ -1413,35 +1450,49 @@ setup_unionfs ()
 		else
 			cow_dirs=''
 		fi
+	else
+		cow_dirs="/"
+	fi
+
+	if [ "${cow_fstype}" != "tmpfs" ] && [ "${cow_dirs}" != "/" ] && [ "${UNIONTYPE}" = "unionmount" ]
+	then
+		true # FIXME: Maybe it does, I don't really know.
+		#panic "unionmount does not support subunions (${cow_dirs})."
+	fi
 
-		for dir in ${cow_dirs}; do
-			mkdir -p /cow${dir}
+	unionmountopts=""
+	unionmountpoint=""
 
-			case "${UNIONTYPE}" in
-				unionfs-fuse)
-					(ulimit -n 16384; unionfs-fuse -o cow -o noinitgroups -o default_permissions -o allow_other -o use_ino -o suid /cow=RW:${exposedrootfs}${dir} "${rootmnt}${dir}" || panic "mount ${UNIONTYPE} on ${rootmnt}${dir} failed with option cow,noinitgroups,default_permissions,allow_other,use_ino,suid=/cow=RW:${exposedrootfs}${dir}")
-					mkdir -p /dev/.initramfs/varrun
-					pidof unionfs-fuse >> /dev/.initramfs/varrun/sendsigs.omit || true
-					;;
+	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"
-					;;
-			esac
-		done
-	else
+		unionmountpoint="${rootmnt}${dir}"
+		unionrw="/cow${dir}"
+		unionro="${rofs}${dir}"
+		# We don't handle spaces and other junk gracefully here, hopefully not needed.
 		case "${UNIONTYPE}" in
 			unionfs-fuse)
-				(ulimit -n 16384; unionfs-fuse -o cow -o noinitgroups -o default_permissions -o allow_other -o use_ino -o suid /cow=RW:${rofsstring} "${rootmnt}" || panic "mount ${UNIONTYPE} on ${rootmnt} failed with option cow,noinitgroups,default_permissions,allow_other,use_ino,suid=/cow:RW:${rofsstring}")
-				mkdir -p /dev/.initramfs/varrun
-				pidof unionfs-fuse >> /dev/.initramfs/varrun/sendsigs.omit || true
+				unionmountopts="-o cow -o noinitgroups -o default_permissions -o allow_other -o use_ino -o suid"
+				unionmountopts="${unionmountopts} ${unionrw}=RW:${unionro}=RO"
+				( sysctl -w fs.file-max=391524 ; ulimit -HSn 16384
+				unionfs-fuse ${unionmountopts} "${unionmountpoint}" ) && \
+					( mkdir -p /run/initramfs
+				pidof unionfs-fuse >> /run/initramfs/sendsigs.omit || true )
 				;;
 
+			unionmount)
+				unionmountopts="-t ${cow_fstype} -o noatime,union,${cow_mountopt} ${cowdevice}"
+				mount_full $unionmountopts "${unionmountpoint}"
+				;;
+
+
 			*)
-				mount -t ${UNIONTYPE} -o noatime,${noxino_opt}dirs=/cow=rw:${rofsstring} ${UNIONTYPE} "${rootmnt}" || panic "mount ${UNIONTYPE} on ${rootmnt} failed with option noatime,${noxino_opt}dirs=/cow=rw:${rofsstring}"
+				unionmountopts="-o noatime,${noxino_opt}dirs=${unionrw}=rw:${unionro}=${roopt}"
+				mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
 				;;
-		esac
-	fi
+		esac || \
+			panic "mount ${UNIONTYPE} on ${unionmountpoint} failed with option ${unionmountopts}"
+	done
 
 	# Correct the permissions of /:
 	chmod 0755 "${rootmnt}"
@@ -1528,13 +1579,19 @@ check_dev ()
 
 		if [ "$ISO_DEVICE" = "/" ]
 		then
-			echo "Warning: device for bootoption isofrom= ($FROMISO) not found.">>/live.log
+			echo "Warning: device for bootoption isofrom= ($FROMISO) not found.">>/live-boot.log
 		else
-			mkdir /isofrom
-			mount "$ISO_DEVICE" /isofrom
-			ISO_NAME="$(echo $FROMISO | sed "s|$ISO_DEVICE||")"
-			loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
-			devname="${loopdevname}"
+			fs_type=$(get_fstype "${ISO_DEVICE}")
+			if is_supported_fs ${fs_type}
+			then
+				mkdir /isofrom
+				mount -t $fs_type "$ISO_DEVICE" /isofrom
+				ISO_NAME="$(echo $FROMISO | sed "s|$ISO_DEVICE||")"
+				loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
+				devname="${loopdevname}"
+			else
+				echo "Warning: unable to mount $ISO_DEVICE." >>/live-boot.log
+			fi
 		fi
 	fi
 
@@ -1610,8 +1667,7 @@ find_livefs ()
 			do
 				if [ "$(cat ${sysblock}/removable)" = "1" ]
 				then
-					if readlink ${sysblock} | grep -q usb ||
-					   readlink ${sysblock}/device | grep -q usb # linux < 2.6.29
+					if readlink ${sysblock} | grep -q usb
 					then
 						for dev in $(subdevices "${sysblock}")
 						do
@@ -1735,15 +1791,15 @@ integrity_check ()
 
 mountroot ()
 {
-        if [ -x /scripts/local-top/cryptroot ]; then
+	if [ -x /scripts/local-top/cryptroot ]; then
 	    /scripts/local-top/cryptroot
 	fi
 
 	exec 6>&1
 	exec 7>&2
-	exec > live.log
+	exec > live-boot.log
 	exec 2>&1
-	tail -f live.log >&7 &
+	tail -f live-boot.log >&7 &
 	tailpid="${!}"
 
 	# Ensure 'panic' function is overridden
@@ -1889,6 +1945,13 @@ mountroot ()
 		log_end_msg
 	fi
 
+	if [ -f /etc/resolv.conf ] && [ ! -s ${rootmnt}/etc/resolv.conf ]
+	then
+		log_begin_msg "Copying /etc/resolv.conf to ${rootmnt}/etc/resolv.conf"
+		cp -v /etc/resolv.conf ${rootmnt}/etc/resolv.conf
+		log_end_msg
+	fi
+
 	maybe_break live-bottom
 	log_begin_msg "Running /scripts/live-bottom\n"
 
@@ -1903,5 +1966,5 @@ mountroot ()
 	exec 1>&6 6>&-
 	exec 2>&7 7>&-
 	kill ${tailpid}
-	[ -w "${rootmnt}/var/log/" ] && cp live.log "${rootmnt}/var/log/" 2>/dev/null
+	[ -w "${rootmnt}/var/log/" ] && cp live-boot.log "${rootmnt}/var/log/" 2>/dev/null
 }