X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=c525c80c89980df9c912036c9b50593fb7114918;hb=7750592e832e06cf41c3f7a9b13ac343fea50898;hp=6f4f5c196802e3031338f12423fba9368b6fa6f2;hpb=38365c3a0a6be4aea3d497974fc3b0a7c0ed73e6;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 6f4f5c1..c525c80 100755
--- a/scripts/live
+++ b/scripts/live
@@ -8,6 +8,7 @@ echo "/root/lib" >> /etc/ld.so.conf
 echo "/root/usr/lib" >> /etc/ld.so.conf
 
 mountpoint="/live/image"
+alt_mountpoint="/media"
 LIVE_MEDIA_PATH="live"
 
 root_persistence="live-rw"
@@ -33,9 +34,6 @@ then
 	touch /etc/mtab
 fi
 
-[ -f /etc/live.conf ] && . /etc/live.conf
-export USERNAME USERFULLNAME HOSTNAME
-
 . /scripts/live-helpers
 
 if [ ! -f /live.vars ]
@@ -53,31 +51,14 @@ Arguments ()
 		case "${ARGUMENT}" in
 			skipconfig)
 				NOACCESSIBILITY="Yes"
-				NOAPPARMOR="Yes"
-				NOAPTCDROM="Yes"
 				NOAUTOLOGIN="Yes"
 				NOCONSOLEKEYBOARD="Yes"
 				NOFASTBOOT="Yes"
 				NOFSTAB="Yes"
-				NOGNOMEPANEL="Yes"
-				NOHOSTS="Yes"
-				NOJOCKEY="Yes"
-				NOKPERSONALIZER="Yes"
-				NOLANGUAGESELECTOR="Yes"
-				NOLOCALES="Yes"
 				NONETWORKING="Yes"
-				NOPOLKITCONF="Yes"
-				NOPOWERMANAGEMENT="Yes"
-				NOPROGRAMCRASHES="Yes"
-				NOSUDO="Yes"
-				NOTIMEZONE="Yes"
-				NOUPDATENOTIFIER="Yes"
-				NOUSER="Yes"
 				NOXAUTOCONFIG="Yes"
-				NOXAUTOLOGIN="Yes"
-				NOXSCREENSAVER="Yes"
 
-				export NOACCESSIBILITY NOAPPARMOR NOAPTCDROM NOAUTOLOGIN NOCONSOLEKEYBOARD NOFASTBOOT NOFSTAB NOGNOMEPANEL NOHOSTS NOJOCKEY NOKPERSONALIZER NOLANGUAGESELECTOR NOLOCALES NONETWORKING NOPOLKITCONF NOPOWERMANAGEMENT NOPROGRAMCRASHES NOSUDO NOTIMEZONE NOUPDATENOTIFIER NOUSER NOXAUTOCONFIG NOXAUTOLOGIN NOXSCREENSAVER
+				export NOACCESSIBILITY NOAUTOLOGIN NOCONSOLEKEYBOARD NOFASTBOOT NOFSTAB NONETWORKING NOXAUTOCONFIG
 				;;
 
 			access=*)
@@ -97,6 +78,17 @@ Arguments ()
 				set -x
 				;;
 
+			dhcp)
+				# Force dhcp even while netbooting
+				# Use for debugging in case somebody works on fixing dhclient
+				DHCP="Force";
+				export DHCP
+				;;
+
+			nodhcp)
+				unset DHCP
+				;;
+
 			ethdevice=*)
 				DEVICE="${ARGUMENT#ethdevice=}"
 				export DEVICE
@@ -122,11 +114,6 @@ Arguments ()
 				export FORCEPERSISTENTFSCK
 				;;
 
-			hook=*)
-				HOOK="${ARGUMENT#hook=}"
-				export HOOK
-				;;
-
 			ftpfs=*)
 				FTPFS="${ARGUMENT#ftpfs=}"
 				export FTPFS
@@ -137,29 +124,11 @@ Arguments ()
 				export HTTPFS
 				;;
 
-			hostname=*)
-				HOSTNAME="${ARGUMENT#hostname=}"
-				LIVECONF="changed"
-				export HOSTNAME LIVECONF
-				;;
-
 			isofrom=*|fromiso=*)
 				FROMISO="${ARGUMENT#*=}"
 				export FROMISO
 				;;
 
-			username=*)
-				USERNAME="${ARGUMENT#username=}"
-				LIVECONF="changed"
-				export USERNAME LIVECONF
-				;;
-
-			userfullname=*)
-				USERFULLNAME="${ARGUMENT#userfullname=}"
-				LIVECONF="changed"
-				export USERFULLNAME LIVECONF
-				;;
-
 			ignore_uuid)
 				IGNORE_UUID="Yes"
 				export IGNORE_UUID
@@ -181,31 +150,6 @@ Arguments ()
 				export STATICIP
 				;;
 
-			keyb=*|kbd-chooser/method=*)
-				KBD="${ARGUMENT#*=}"
-				export KBD
-				;;
-
-			klayout=*|console-setup/layoutcode=*)
-				KLAYOUT="${ARGUMENT#*=}"
-				export KLAYOUT
-				;;
-
-			kvariant=*|console-setup/variantcode=*)
-				KVARIANT="${ARGUMENT#*=}"
-				export KVARIANT
-				;;
-
-			kmodel=*|console-setup/modelcode=*)
-				KMODEL="${ARGUMENT#*=}"
-				export KMODEL
-				;;
-
-			koptions=*)
-				KOPTIONS="${ARGUMENT#koptions=}"
-				export KOPTIONS
-				;;
-
 			live-getty)
 				LIVE_GETTY="1"
 				export LIVE_GETTY
@@ -236,17 +180,6 @@ Arguments ()
 				export LIVE_MEDIA_TIMEOUT
 				;;
 
-			language=*|debian-installer/language=*)
-				language=${x#debian-installer/language=}
-				locale="$(lang2locale "$language")"
-				set_locale="true"
-				;;
-
-			locale=*|debian-installer/locale=*)
-				LOCALE="${ARGUMENT#*=}"
-				export LOCALE
-				;;
-
 			module=*)
 				MODULE="${ARGUMENT#module=}"
 				export MODULE
@@ -272,31 +205,11 @@ Arguments ()
 				export NOACCESSIBILITY
 				;;
 
-			noapparmor)
-				NOAPPARMOR="Yes"
-				export NOAPPARMOR
-				;;
-
-			noaptcdrom)
-				NOAPTCDROM="Yes"
-				export NOAPTCDROM
-				;;
-
 			noautologin)
 				NOAUTOLOGIN="Yes"
 				export NOAUTOLOGIN
 				;;
 
-			noxautologin)
-				NOXAUTOLOGIN="Yes"
-				export NOXAUTOLOGIN
-				;;
-
-			noconsolekeyboard)
-				NOCONSOLEKEYBOARD="Yes"
-				export NOCONSOLEKEYBOARD
-				;;
-
 			nofastboot)
 				NOFASTBOOT="Yes"
 				export NOFASTBOOT
@@ -307,81 +220,21 @@ Arguments ()
 				export NOFSTAB
 				;;
 
-			nognomepanel)
-				NOGNOMEPANEL="Yes"
-				export NOGNOMEPANEL
-				;;
-
-			nohosts)
-				NOHOSTS="Yes"
-				export NOHOSTS
-				;;
-
-			nokpersonalizer)
-				NOKPERSONALIZER="Yes"
-				export NOKPERSONALIZER
-				;;
-
-			nolanguageselector)
-				NOLANGUAGESELECTOR="Yes"
-				export NOLANGUAGESELECTOR
-				;;
-
-			nolocales)
-				NOLOCALES="Yes"
-				export NOLOCALES
-				;;
-
 			nonetworking)
 				NONETWORKING="Yes"
 				export NONETWORKING
 				;;
 
-			nopowermanagement)
-				NOPOWERMANAGEMENT="Yes"
-				export NOPOWERMANAGEMENT
-				;;
-
-			noprogramcrashes)
-				NOPROGRAMCRASHES="Yes"
-				export NOPROGRAMCRASHES
-				;;
-
-			nojockey)
-				NOJOCKEY="Yes"
-				export NOJOCKEY
-				;;
-
-			nosudo)
-				NOSUDO="Yes"
-				export NOSUDO
-				;;
-
 			swapon)
 				SWAPON="Yes"
 				export SWAPON
 				;;
 
-			noupdatenotifier)
-				NOUPDATENOTIFIER="Yes"
-				export NOUPDATENOTIFIER
-				;;
-
-			nouser)
-				NOUSER="Yes"
-				export NOUSER
-				;;
-
 			noxautoconfig)
 				NOXAUTOCONFIG="Yes"
 				export NOXAUTOCONFIG
 				;;
 
-			noxscreensaver)
-				NOXSCREENSAVER="Yes"
-				export NOXSCREENSAVER
-				;;
-
 			persistent)
 				PERSISTENT="Yes"
 				export PERSISTENT
@@ -428,25 +281,6 @@ Arguments ()
 				export NOPRESEED
 				;;
 
-			url=*)
-				URL_LOCATION="${ARGUMENT#url=}"
-
-				mount -o bind /sys /root/sys
-				mount -o bind /proc /root/proc
-				mount -o bind /dev /root/dev
-
-				mkdir -p /root/var/run/network
-				[ "${NETBOOT}" ] || chroot /root dhclient eth0
-				chroot /root wget -P /tmp "${URL_LOCATION}"
-				[ "${NETBOOT}" ] || chroot /root ifconfig eth0 down
-
-				umount /root/sys
-				umount /root/proc
-				umount /root/dev
-
-				LOCATIONS="/tmp/$(basename ${URL_LOCATION}) ${LOCATIONS}"
-				;;
-
 			*/*=*)
 				question="${ARGUMENT%%=*}"
 				value="${ARGUMENT#*=}"
@@ -464,21 +298,6 @@ Arguments ()
 				export SILENT
 				;;
 
-			textonly)
-				TEXTONLY="Yes"
-				export TEXTONLY
-				;;
-
-			timezone=*)
-				TIMEZONE="${ARGUMENT#timezone=}"
-				export TIMEZONE
-				;;
-
-			notimezone)
-				NOTIMEZONE="Yes"
-				export NOTIMEZONE
-				;;
-
 			todisk=*)
 				TODISK="${ARGUMENT#todisk=}"
 				export TODISK
@@ -520,11 +339,6 @@ Arguments ()
 				export UNIONTYPE
 				;;
 
-			utc=*)
-				UTC="${ARGUMENT#utc=}"
-				export UTC
-				;;
-
 			xdebconf)
 				XDEBCONF="Yes"
 				export XDEBCONF
@@ -667,7 +481,7 @@ is_nice_device ()
 {
 	sysfs_path="${1#/sys}"
 
-	if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-|platform-orion-ehci|platform-mmc|platform-mxsdhci|)"
+	if /lib/udev/path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-|platform-orion-ehci|platform-mmc|platform-mxsdhci|)"
 	then
 		return 0
 	elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'
@@ -705,7 +519,7 @@ copy_live_to ()
 	if [ "${copytodev}" = "ram" ]
 	then
 		# copying to ram:
-		freespace=$( expr $(awk '/MemFree/{print $2}' /proc/meminfo) + $( awk '/\<Cached/{print $2}' /proc/meminfo ) )
+		freespace=$(awk '/^MemFree:/{f=$2} /^Cached:/{c=$2} END{print f+c}' /proc/meminfo)
 		mount_options="-o size=${size}k"
 		free_string="memory"
 		fstype="tmpfs"
@@ -759,7 +573,11 @@ copy_live_to ()
 				rsync -a --progress ${copyfrom}/* ${copyto} 1>/dev/console  # "cp -a" from busybox also copies hidden files
 			else
 				mkdir -p ${copyto}/${LIVE_MEDIA_PATH}
-				cp -a ${copyfrom}/${LIVE_MEDIA_PATH}/* ${copyto}/${LIVE_MEDIA_PATH}   # "cp -a" from busybox also copies hidden files
+				cp -a ${copyfrom}/${LIVE_MEDIA_PATH}/* ${copyto}/${LIVE_MEDIA_PATH}
+				if [ -e ${copyfrom}/${LIVE_MEDIA_PATH}/.disk ]
+				then
+					cp -a ${copyfrom}/${LIVE_MEDIA_PATH}/.disk ${copyto}
+				fi
 			fi
 		fi
 
@@ -773,8 +591,6 @@ copy_live_to ()
 
 do_netmount ()
 {
-	rc=1
-
 	modprobe -q af_packet # For DHCP
 
 	udevadm trigger
@@ -852,10 +668,12 @@ do_netmount ()
 		NFSROOT=${ROOTSERVER}:${ROOTPATH}
 	fi
 
-	if ( [ -n "${FETCH}" ] || [ -n "${HTTPFS}" ] || [ -n "${FTPFS}" ] ) && do_httpmount
+	rc=1
+
+	if ( [ -n "${FETCH}" ] || [ -n "${HTTPFS}" ] || [ -n "${FTPFS}" ] )
 	then
-		rc=0
-		return ${rc}
+		do_httpmount
+		return $?
 	fi
 
 	if [ "${NFSROOT#*:}" = "${NFSROOT}" ] && [ "$NETBOOT" != "cifs" ]
@@ -882,19 +700,25 @@ do_netmount ()
 do_httpmount ()
 {
 	rc=1
-	dest="${mountpoint}/${LIVE_MEDIA_PATH}"
-	mount -t ramfs ram "${mountpoint}"
-	mkdir -p "${dest}"
 
 	for webfile in HTTPFS FTPFS FETCH
 	do
-		url="$(eval echo \"\$\{${webfile}\}\")"
-		extension="$(echo "${url}" | sed 's/\(.*\)\.\(.*\)/\2/')"
+		local url="$(eval echo \"\$\{${webfile}\}\")"
+		local extension="$(echo "${url}" | sed 's/\(.*\)\.\(.*\)/\2/')"
 
 		if [ -n "$url" ]
 		then
 			case "${extension}" in
-				squashfs|tgz|tar)
+				iso|squashfs|tgz|tar)
+					if [ "${extension}" = "iso" ]
+					then
+						mkdir -p "${alt_mountpoint}"
+						dest="${alt_mountpoint}"
+					else
+						local dest="${mountpoint}/${LIVE_MEDIA_PATH}"
+						mount -t ramfs ram "${mountpoint}"
+						mkdir -p "${dest}"
+					fi
 					if [ "${webfile}" = "FETCH" ]
 					then
 						case "$url" in
@@ -925,6 +749,12 @@ do_httpmount ()
 					fi
 					[ ${?} -eq 0 ] && rc=0
 					[ "${extension}" = "tgz" ] && live_dest="ram"
+					if [ "${extension}" = "iso" ]
+					then
+						isoloop=$(setup_loop "${dest}/$(basename "${url}")" "loop" "/sys/block/loop*" "" '')
+						mount -t iso9660 "${isoloop}" "${mountpoint}"
+						rc=${?}
+					fi
 					break
 					;;
 
@@ -937,7 +767,15 @@ do_httpmount ()
 
 	if [ ${rc} != 0 ]
 	then
-	    umount "${mountpoint}"
+		if [ -d "${alt_mountpoint}" ]
+		then
+		        umount "${alt_mountpoint}"
+			rmdir "${alt_mountpoint}"
+		fi
+		umount "${mountpoint}"
+	elif [ "${webfile}"  != "FETCH" ] ; then
+		NETBOOT="${webfile}"
+		export NETBOOT
 	fi
 
 	return ${rc}
@@ -1008,7 +846,7 @@ do_snap_copy ()
 			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) + $( awk '/\<Cached/{print $2}' /proc/meminfo))
+			freespace=$(awk '/^MemFree:/{f=$2} /^Cached:/{c=$2} END{print f+c}' /proc/meminfo)
 		fi
 
 		tomount="/mnt/tmpsnap"
@@ -1066,7 +904,7 @@ find_snap ()
 try_snap ()
 {
         # copy the contents of previously found snapshot to ${snap_mount}
-	# and remember the device and filename for resync on exit in live-initramfs.init
+	# and remember the device and filename for resync on exit in live-boot.init
 
 	snapdata="${1}"
 	snap_mount="${2}"
@@ -1677,7 +1515,7 @@ find_livefs ()
 
 	# or do the scan of block devices
 	# prefer removable devices over non-removable devices, so scan them first
-	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
+	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | egrep -v "/(loop|ram|dm-|fd)")
 	do
 		if [ "$(cat ${sysblock}/removable)" = "1" ]
 		then
@@ -1717,7 +1555,7 @@ find_livefs ()
 		then
 			# This is an ugly hack situation, the block device has
 			# an image directly on it.  It's hopefully
-			# live-initramfs, so take it and run with it.
+			# live-boot, so take it and run with it.
 			ln -s "${devname}" "${devname}.${fstype}"
 			echo "${devname}.${fstype}"
 			return 0
@@ -1885,6 +1723,13 @@ mountroot ()
 		mount -n -o bind /dev "${rootmnt}/dev"
 	fi
 
+	# Move to the new root filesystem so that programs there can get at it.
+	if [ ! -d /root/live/image ]
+	then
+		mkdir -p /root/live/image
+		mount --move /live/image /root/live/image
+	fi
+
 	maybe_break live-bottom
 	log_begin_msg "Running /scripts/live-bottom\n"
 
@@ -1900,8 +1745,4 @@ mountroot ()
 	exec 2>&7 7>&-
 	kill ${tailpid}
 	[ -w "${rootmnt}/var/log/" ] && cp live.log "${rootmnt}/var/log/" 2>/dev/null
-	if [ -f /etc/live.conf ]
-	then
-		cp /etc/live.conf "${rootmnt}/etc/"
-	fi
 }