X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=780c5de16cdab8afc7e9edf3ae1c3cbf7a185e40;hb=3039c635545638a79f4f5e7705affb7997e5f918;hp=a9c0f132f0c35793a0484e05d28c3159815d6ebf;hpb=9ce16839bd6d9da58889eaec40cacb5fa92b3809;p=live-boot-grml.git diff --git a/scripts/live b/scripts/live index a9c0f13..780c5de 100755 --- a/scripts/live +++ b/scripts/live @@ -8,16 +8,9 @@ echo "/root/lib" >> /etc/ld.so.conf echo "/root/usr/lib" >> /etc/ld.so.conf mountpoint="/live/image" -ext_mountpoint="/ext_volume" +alt_mountpoint="/media" LIVE_MEDIA_PATH="live" -root_persistence="live-rw" -home_persistence="home-rw" -root_snapshot_label="live-sn" -home_snapshot_label="home-sn" - -USERNAME="user" -USERFULLNAME="Live user" HOSTNAME="host" mkdir -p "${mountpoint}" @@ -34,9 +27,6 @@ then touch /etc/mtab fi -[ -f /etc/live.conf ] && . /etc/live.conf -export USERNAME USERFULLNAME HOSTNAME - . /scripts/live-helpers if [ ! -f /live.vars ] @@ -44,437 +34,6 @@ then touch /live.vars fi -Arguments () -{ - PRESEEDS="" - LOCATIONS="" - - for ARGUMENT in $(cat /proc/cmdline) - do - case "${ARGUMENT}" in - skipconfig) - NOACCESSIBILITY="Yes" - NOAPTCDROM="Yes" - NOAUTOLOGIN="Yes" - NOCONSOLEKEYBOARD="Yes" - NOFASTBOOT="Yes" - NOFSTAB="Yes" - NOHOSTS="Yes" - NONETWORKING="Yes" - NOTIMEZONE="Yes" - NOXAUTOCONFIG="Yes" - NOXAUTOLOGIN="Yes" - - export NOACCESSIBILITY NOAPTCDROM NOAUTOLOGIN NOCONSOLEKEYBOARD NOFASTBOOT NOFSTAB NOHOSTS NONETWORKING NOTIMEZONE NOXAUTOCONFIG NOXAUTOLOGIN - ;; - - access=*) - ACCESS="${ARGUMENT#access=}" - export ACCESS - ;; - - console=*) - DEFCONSOLE="${ARGUMENT#*=}" - export DEFCONSOLE - ;; - - debug) - DEBUG="Yes" - export DEBUG - - set -x - ;; - - ethdevice=*) - DEVICE="${ARGUMENT#ethdevice=}" - export DEVICE - ;; - - ethdevice=*) - ETHDEVICE="${ARGUMENT#ethdevice=}" - export ETHDEVICE - ;; - - ethdevice-timeout=*) - ETHDEV_TIMEOUT="${ARGUMENT#ethdevice-timeout=}" - export ETHDEV_TIMEOUT - ;; - - fetch=*) - FETCH="${ARGUMENT#fetch=}" - export FETCH - ;; - - forcepersistentfsck) - FORCEPERSISTENTFSCK="Yes" - export FORCEPERSISTENTFSCK - ;; - - ftpfs=*) - FTPFS="${ARGUMENT#ftpfs=}" - export FTPFS - ;; - - httpfs=*) - HTTPFS="${ARGUMENT#httpfs=}" - export HTTPFS - ;; - - 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 - ;; - - integrity-check) - INTEGRITY_CHECK="Yes" - export INTEGRITY_CHECK - ;; - - ip=*) - STATICIP="${ARGUMENT#ip=}" - - if [ -z "${STATICIP}" ] - then - STATICIP="frommedia" - fi - - 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 - ;; - - live-media=*|bootfrom=*) - LIVE_MEDIA="${ARGUMENT#*=}" - export LIVE_MEDIA - ;; - - live-media-encryption=*|encryption=*) - LIVE_MEDIA_ENCRYPTION="${ARGUMENT#*=}" - export LIVE_MEDIA_ENCRYPTION - ;; - - live-media-offset=*) - LIVE_MEDIA_OFFSET="${ARGUMENT#live-media-offset=}" - export LIVE_MEDIA_OFFSET - ;; - - live-media-path=*) - LIVE_MEDIA_PATH="${ARGUMENT#live-media-path=}" - export LIVE_MEDIA_PATH - ;; - - live-media-timeout=*) - LIVE_MEDIA_TIMEOUT="${ARGUMENT#live-media-timeout=}" - export LIVE_MEDIA_TIMEOUT - ;; - - module=*) - MODULE="${ARGUMENT#module=}" - export MODULE - ;; - - netboot=*) - NETBOOT="${ARGUMENT#netboot=}" - export NETBOOT - ;; - - nfsopts=*) - NFSOPTS="${ARGUMENT#nfsopts=}" - export NFSOPTS - ;; - - nfscow=*) - NFS_COW="${ARGUMENT#nfscow=}" - export NFS_COW - ;; - - noaccessibility) - NOACCESSIBILITY="Yes" - export NOACCESSIBILITY - ;; - - 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 - ;; - - nofstab) - NOFSTAB="Yes" - export NOFSTAB - ;; - - nohosts) - NOHOSTS="Yes" - export NOHOSTS - ;; - - nonetworking) - NONETWORKING="Yes" - export NONETWORKING - ;; - - swapon) - SWAPON="Yes" - export SWAPON - ;; - - noxautoconfig) - NOXAUTOCONFIG="Yes" - export NOXAUTOCONFIG - ;; - - noxscreensaver) - NOXSCREENSAVER="Yes" - export NOXSCREENSAVER - ;; - - persistent) - PERSISTENT="Yes" - export PERSISTENT - ;; - - persistent=*) - PERSISTENT="${ARGUMENT#persistent=}" - if [ -z "${PERSISTENT}" ] - then - PERSISTENT="Yes" - fi - export PERSISTENT - ;; - - persistent-path=*) - PERSISTENT_PATH="${ARGUMENT#persistent-path=}" - 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 - ;; - - quickusbmodules) - QUICKUSBMODULES="Yes" - export QUICKUSBMODULES - ;; - - preseed/file=*|file=*) - LOCATIONS="${ARGUMENT#*=} ${LOCATIONS}" - export LOCATIONS - ;; - - nopreseed) - NOPRESEED="Yes" - 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#*=}" - PRESEEDS="${PRESEEDS}\"${question}=${value}\" " - export PRESEEDS - ;; - - showmounts) - SHOWMOUNTS="Yes" - export SHOWMOUNTS - ;; - - silent) - SILENT="Yes" - export SILENT - ;; - - textonly) - TEXTONLY="Yes" - export TEXTONLY - ;; - - timezone=*) - TIMEZONE="${ARGUMENT#timezone=}" - export TIMEZONE - ;; - - notimezone) - NOTIMEZONE="Yes" - export NOTIMEZONE - ;; - - todisk=*) - TODISK="${ARGUMENT#todisk=}" - export TODISK - ;; - - toram) - TORAM="Yes" - export TORAM - ;; - - toram=*) - TORAM="Yes" - MODULETORAM="${ARGUMENT#toram=}" - export TORAM MODULETORAM - ;; - - exposedroot) - EXPOSED_ROOT="Yes" - export EXPOSED_ROOT - ;; - - plainroot) - PLAIN_ROOT="Yes" - export PLAIN_ROOT - ;; - - skipunion) - SKIP_UNION_MOUNTS="Yes" - export SKIP_UNION_MOUNTS - ;; - - root=*) - ROOT="${ARGUMENT#root=}" - export ROOT - ;; - - union=*) - UNIONTYPE="${ARGUMENT#union=}" - export UNIONTYPE - ;; - - xdebconf) - XDEBCONF="Yes" - export XDEBCONF - ;; - - xdriver=*) - XDRIVER="${ARGUMENT#xdriver=}" - export XDRIVER - ;; - - xvideomode=*) - XVIDEOMODE="${ARGUMENT#xvideomode=}" - export XVIDEOMODE - ;; - esac - done - - # sort of compatibility with netboot.h from linux docs - if [ -z "${NETBOOT}" ] - then - if [ "${ROOT}" = "/dev/nfs" ] - then - NETBOOT="nfs" - export NETBOOT - elif [ "${ROOT}" = "/dev/cifs" ] - then - NETBOOT="cifs" - export NETBOOT - fi - fi - - if [ -z "${MODULE}" ] - then - MODULE="filesystem" - export MODULE - fi - - if [ -z "${UNIONTYPE}" ] - then - UNIONTYPE="aufs" - export UNIONTYPE - fi -} - is_live_path () { DIRECTORY="${1}" @@ -573,7 +132,16 @@ is_nice_device () { sysfs_path="${1#/sys}" - if /lib/udev/path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-|platform-orion-ehci|platform-mmc|platform-mxsdhci|)" + if [ -e /lib/udev/path_id ] + then + # squeeze + PATH_ID="/lib/udev/path_id" + else + # wheezy/sid (udev >= 174) + PATH_ID="/sbin/udevadm test-builtin path_id" + fi + + if ${PATH_ID} "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-[^-]*-(ide|sas|scsi|usb|virtio)|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci)" then return 0 elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$' @@ -582,6 +150,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 @@ -636,6 +207,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}" @@ -681,17 +259,68 @@ copy_live_to () return 0 } -do_netmount () +do_netsetup () { modprobe -q af_packet # For DHCP udevadm trigger udevadm settle + [ -n "$ETHDEV_TIMEOUT" ] || ETHDEV_TIMEOUT=15 + echo "Using timeout of $ETHDEV_TIMEOUT seconds for network configuration." + if [ -z "${NETBOOT}" ] && [ -z "${FETCH}" ] && \ [ -z "${HTTPFS}" ] && [ -z "${FTPFS}" ] then + + # support for Syslinux IPAPPEND parameter + # it sets the BOOTIF variable on the kernel parameter + + if [ -n "${BOOTIF}" ] + then + # pxelinux sets BOOTIF to a value based on the mac address of the + # network card used to PXE boot, so use this value for DEVICE rather + # than a hard-coded device name from initramfs.conf. this facilitates + # network booting when machines may have multiple network cards. + # pxelinux sets BOOTIF to 01-$mac_address + + # strip off the leading "01-", which isn't part of the mac + # address + temp_mac=${BOOTIF#*-} + + # convert to typical mac address format by replacing "-" with ":" + bootif_mac="" + IFS='-' + for x in $temp_mac + do + if [ -z "$bootif_mac" ] + then + bootif_mac="$x" + else + bootif_mac="$bootif_mac:$x" + fi + done + unset IFS + + # look for devices with matching mac address, and set DEVICE to + # appropriate value if match is found. + + for device in /sys/class/net/* + do + if [ -f "$device/address" ] + then + current_mac=$(cat "$device/address") + + if [ "$bootif_mac" = "$current_mac" ] + then + DEVICE=${device##*/} + break + fi + fi + done + fi + # if ethdevice was not specified on the kernel command line # make sure we try to get a working network configuration # for *every* present network device (except for loopback of course) @@ -710,9 +339,6 @@ do_netmount () devlist="$devlist $device" done - [ -n "$ETHDEV_TIMEOUT" ] || ETHDEV_TIMEOUT=15 - echo "Using timeout of $ETHDEV_TIMEOUT seconds for network configuration." - # this is tricky (and ugly) because ipconfig sometimes just hangs/runs into # an endless loop; iff execution fails give it two further tries, that's # why we use '$devlist $devlist $devlist' for the other for loop @@ -736,24 +362,62 @@ do_netmount () done else - ipconfig ${DEVICE} | tee /netboot.config + for interface in ${DEVICE}; do + ipconfig -t "$ETHDEV_TIMEOUT" ${interface} | tee /netboot-${interface}.config + [ -e /tmp/net-${interface}.conf ] && . /tmp/net-${interface}.conf + if [ "$IPV4ADDR" != "0.0.0.0" ] + then + break + fi + done fi - # source relevant ipconfig output - OLDHOSTNAME=${HOSTNAME} - . /tmp/net-${DEVICE}.conf - [ -z ${HOSTNAME} ] && HOSTNAME=${OLDHOSTNAME} - export HOSTNAME + for interface in ${DEVICE}; do + # source relevant ipconfig output + OLDHOSTNAME=${HOSTNAME} + [ -e /tmp/net-${interface}.conf ] && . /tmp/net-${interface}.conf + [ -z ${HOSTNAME} ] && HOSTNAME=${OLDHOSTNAME} + export HOSTNAME - # Check if we have a network device at all - if ! ls /sys/class/net/"$DEVICE" > /dev/null 2>&1 && \ - ! ls /sys/class/net/eth0 > /dev/null 2>&1 && \ - ! ls /sys/class/net/wlan0 > /dev/null 2>&1 && \ - ! ls /sys/class/net/ath0 > /dev/null 2>&1 && \ - ! ls /sys/class/net/ra0 > /dev/null 2>&1 - then - panic "No supported network device found, maybe a non-mainline driver is required." - fi + if [ -n "${interface}" ] + then + HWADDR="$(cat /sys/class/net/${interface}/address)" + fi + + if [ ! -e "/etc/resolv.conf" ] + then + echo "Creating /etc/resolv.conf" + + if [ -n "${DNSDOMAIN}" ] + then + echo "domain ${DNSDOMAIN}" > /etc/resolv.conf + echo "search ${DNSDOMAIN}" >> /etc/resolv.conf + fi + + for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1} + do + if [ -n "$i" ] && [ "$i" != 0.0.0.0 ] + then + echo "nameserver $i" >> /etc/resolv.conf + fi + done + fi + + # Check if we have a network device at all + if ! ls /sys/class/net/"$interface" > /dev/null 2>&1 && \ + ! ls /sys/class/net/eth0 > /dev/null 2>&1 && \ + ! ls /sys/class/net/wlan0 > /dev/null 2>&1 && \ + ! ls /sys/class/net/ath0 > /dev/null 2>&1 && \ + ! ls /sys/class/net/ra0 > /dev/null 2>&1 + then + panic "No supported network device found, maybe a non-mainline driver is required." + fi + done +} + +do_netmount() +{ + do_netsetup if [ "${NFSROOT}" = "auto" ] then @@ -789,6 +453,54 @@ do_netmount () return ${rc} } +do_iscsi() +{ + do_netsetup + #modprobe ib_iser + modprobe iscsi_tcp + local debugopt="" + [ "${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 + if [ -n "${ISCSI_SERVER}" ] ; then + iscsistart $debugopt -i "${ISCSI_INITIATORNAME}" -t "${ISCSI_TARGET}" -g 1 -a "${ISCSI_SERVER}" -p "${ISCSI_PORT}" + else + iscsistart $debugopt -i "${ISCSI_INITIATORNAME}" -t "${ISCSI_TARGET}" -g 1 -a "${ISCSI_PORTAL}" -p 3260 + fi + if [ $? != 0 ] + then + panic "Failed to log into iscsi target" + fi + local host="$(ls -d /sys/class/scsi_host/host*/device/iscsi_host:host* \ + /sys/class/scsi_host/host*/device/iscsi_host/host* | sed -e 's:/device.*::' -e 's:.*host::')" + if [ -n "${host}" ] + then + local devices="" + local i=0 + while [ -z "${devices}" -a $i -lt 60 ] + do + sleep 1 + devices="$(ls -d /sys/class/scsi_device/${host}*/device/block:* \ + /sys/class/scsi_device/${host}*/device/block/* | sed -e 's!.*[:/]!!')" + i=$(expr $i + 1) + echo -ne $i\\r + done + for dev in $devices + do + if check_dev "null" "/dev/$dev" + then + NETBOOT="iscsi" + export NETBOOT + return 0; + fi + done + panic "Failed to locate a live device on iSCSI devices (tried: $devices)." + else + panic "Failed to locate iSCSI host in /sys" + fi +} + do_httpmount () { rc=1 @@ -804,8 +516,8 @@ do_httpmount () iso|squashfs|tgz|tar) if [ "${extension}" = "iso" ] then - mkdir -p "${ext_mountpoint}" - dest="${ext_mountpoint}" + mkdir -p "${alt_mountpoint}" + dest="${alt_mountpoint}" else local dest="${mountpoint}/${LIVE_MEDIA_PATH}" mount -t ramfs ram "${mountpoint}" @@ -838,6 +550,7 @@ do_httpmount () fi modprobe fuse $FUSE_MOUNT "${url}" "${dest}" + ROOT_PID="$(minips h -C "$FUSE_MOUNT" | { read x y ; echo "$x" ; } )" fi [ ${?} -eq 0 ] && rc=0 [ "${extension}" = "tgz" ] && live_dest="ram" @@ -859,10 +572,10 @@ do_httpmount () if [ ${rc} != 0 ] then - if [ -d "${ext_mountpoint}" ] + if [ -d "${alt_mountpoint}" ] then - umount "${ext_mountpoint}" - rmdir "${ext_mountpoint}" + umount "${alt_mountpoint}" + rmdir "${alt_mountpoint}" fi umount "${mountpoint}" elif [ "${webfile}" != "FETCH" ] ; then @@ -879,9 +592,9 @@ do_nfsmount () modprobe -q nfs - if [ -z "${NFSOPTS}" ] + if [ -n "${NFSOPTS}" ] then - NFSOPTS="" + NFSOPTS="-o ${NFSOPTS}" fi log_begin_msg "Trying nfsmount -o nolock -o ro ${NFSOPTS} ${NFSROOT} ${mountpoint}" @@ -908,7 +621,7 @@ do_cifsmount () then CIFSOPTS="-ouser=root,password=" else - CIFSOPTS="${NFSOPTS}" + CIFSOPTS="-o ${NFSOPTS}" fi log_begin_msg "Trying mount.cifs ${NFSROOT} ${mountpoint} ${CIFSOPTS}" @@ -932,6 +645,8 @@ do_snap_copy () if [ -b "${fromdev}" ] then + log_success_msg "Copying snapshot ${fromdev} to ${todir}..." + # look for free mem if [ -n "${HOMEMOUNTED}" -a "${snap_type}" = "HOME" ] then @@ -969,38 +684,29 @@ do_snap_copy () return 0 else - return 1 - log_warning_msg "Unable to find the snapshot ${snap_type} medium" + return 1 fi } -find_snap () -{ - # Look for ${snap_label}.* in block devices - snap_label="${1}" - - if [ "${PERSISTENT}" != "nofiles" ] - then - # search for image files - snapdata=$(find_files "${PERSISTENT_PATH}${snap_label}.squashfs ${PERSISTENT_PATH}${snap_label}.cpio.gz ${PERSISTENT_PATH}${snap_label}.ext2 ${PERSISTENT_PATH}${snap_label}.ext3 ${PERSISTENT_PATH}${snap_label}.ext4 ${PERSISTENT_PATH}${snap_label}.jffs2") - fi - - if [ -z "${snapdata}" ] - then - snapdata=$(find_cow_device "${snap_label}") - fi - echo "${snapdata}" -} - 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}" snap_mount="${2}" snap_type="${3}" + snap_relpath="${4}" + + if [ -z "${snap_relpath}" ] + then + # root snapshot, default usage + snap_relpath="/" + else + # relative snapshot (actually used just for "/home" snapshots) + snap_mount="${2}${snap_relpath}" + fi if [ -n "${snapdata}" ] && [ ! -b "${snapdata}" ] then @@ -1009,19 +715,20 @@ try_snap () snapback="$(echo ${snapdata} | cut -f2 -d ' ')" snapfile="$(echo ${snapdata} | cut -f3 -d ' ')" - RES="" if ! try_mount "${snapdev}" "${snapback}" "ro" then break fi + RES="0" + if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\|ext3\|ext4\|jffs2\)' then # squashfs, jffs2 or ext2/ext3/ext4 snapshot dev=$(get_backing_device "${snapback}/${snapfile}") do_snap_copy "${dev}" "${snap_mount}" "${snap_type}" - RES=$? + RES="$?" else # cpio.gz snapshot @@ -1037,9 +744,20 @@ try_snap () cpioargs='--unconditional --make-directories' fi - if ! (cd "${snap_mount}" && zcat "${snapback}/${snapfile}" | cpio $cpioargs --extract --preserve-modification-time --no-absolute-filenames --sparse 2>/dev/null) + if [ -s "${snapback}/${snapfile}" ] + then + BEFOREDIR="$(pwd)" + cd "${snap_mount}" && zcat "${snapback}/${snapfile}" | $cpiopath $cpioargs --extract --preserve-modification-time --no-absolute-filenames --sparse 2>/dev/null + RES="$?" + cd "${BEFOREDIR}" + else + log_warning_msg "${snapback}/${snapfile} is empty, adding it for sync on reboot." + RES="0" + fi + + if [ "${RES}" != "0" ] then - log_warning_msg "failure to \"zcat ${snapback}/${snapfile} | cpio $cpioargs --extract --preserve-modification-time --no-absolute-filenames --sparse\"" + log_warning_msg "failure to \"zcat ${snapback}/${snapfile} | $cpiopath $cpioargs --extract --preserve-modification-time --no-absolute-filenames --sparse\"" fi fi @@ -1067,7 +785,7 @@ try_snap () if ! do_snap_copy "${dev}" "${snap_mount}" "${snap_type}" then - log_warning_msg "Impossible to include the ${snap_type} Snapshot" + log_warning_msg "Impossible to include the ${snap_type} Snapshot (i)" return 1 else if [ -n "${snapfile}" ] @@ -1077,11 +795,14 @@ try_snap () fi fi else - log_warning_msg "Impossible to include the ${snap_type} Snapshot" + log_warning_msg "Impossible to include the ${snap_type} Snapshot (o)" return 1 fi - echo "export ${snap_type}SNAP="/cow${snap_mount#$rootmnt}":${snapdev}:${snapfile}" >> /etc/live.conf # for resync on reboot/halt + if [ -z ${PERSISTENCE_READONLY} ] + then + echo "export ${snap_type}SNAP=${snap_relpath}:${snapdev}:${snapfile}" >> snapshot.conf # for resync on reboot/halt + fi return 0 } @@ -1089,10 +810,10 @@ setup_unionfs () { image_directory="${1}" rootmnt="${2}" - addimage_directory="${3}" + addimage_directory="${3}" case ${UNIONTYPE} in - aufs|unionfs) + aufs|unionfs|overlayfs) modprobe -q -b ${UNIONTYPE} if ! cut -f2 /proc/filesystems | grep -q "^${UNIONTYPE}\$" && [ -x /bin/unionfs-fuse ] @@ -1118,20 +839,8 @@ setup_unionfs () croot="/" # Let's just mount the read-only file systems first - rofsstring="" rofslist="" - if [ "${UNIONTYPE}" = "aufs" ] - then - roopt="rr" - noxino_opt="noxino," - elif [ "${UNIONTYPE}" = "unionfs-fuse" ] - then - roopt="RO" - else - roopt="ro" - fi - if [ -z "${PLAIN_ROOT}" ] then # Read image names from ${MODULE}.module if it exists @@ -1178,7 +887,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}" @@ -1195,7 +904,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 @@ -1218,9 +926,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 @@ -1228,19 +944,24 @@ 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 + # tmpfs file systems + touch /etc/fstab + mkdir -p /live + mount -t tmpfs tmpfs /live + mkdir -p /live/overlay - # Looking for "${root_persistence}" device or file - if [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ] + # Looking for persistence devices or files + if [ -n "${PERSISTENCE}" ] && [ -z "${NOPERSISTENCE}" ] then + if [ -z "${QUICKUSBMODULES}" ] then # Load USB modules @@ -1268,48 +989,67 @@ setup_unionfs () done fi - # search for label and files (this could be hugely optimized) - cowprobe=$(find_cow_device "${root_persistence}") - if [ -b "${cowprobe}" ] - then - # Blacklist /cow device, to avoid inconsistent setups for overlapping snapshots - # makes sense to have both persistence for /cow and /home mounted, maybe also with - # snapshots to be sure to really store some e.g key config files, - # but not on the same media - blacklistdev="${cowprobe}" - PERSISTENCE_IS_ON="1" - export PERSISTENCE_IS_ON - fi - # homecow just mount something on /home, this should be generalized some way - homecow=$(find_cow_device "${home_persistence}" "${blacklistdev}") - if [ -b "${homecow}" ] + case "${PERSISTENCE_MEDIA}" in + removable) + whitelistdev="$(removable_dev)" + ;; + removable-usb) + whitelistdev="$(removable_usb_dev)" + ;; + *) + whitelistdev="" + ;; + esac + + if echo ${PERSISTENCE_METHOD} | grep -qe "\" then - PERSISTENCE_IS_ON="1" - export PERSISTENCE_IS_ON + overlays="${old_root_overlay_label} ${old_home_overlay_label} ${custom_overlay_label}" fi - 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|ext4|jffs2 snapshot types. - home_snapdata=$(find_snap "${home_snapshot_label}" "${blacklistdev}") - if [ -b "${cowprobe}" ] + if echo ${PERSISTENCE_METHOD} | grep -qe "\" then - cowdevice=${cowprobe} - cow_fstype=$(get_fstype "${cowprobe}") - cow_mountopt="rw,noatime" - - if [ "${FORCEPERSISTENTFSCK}" = "Yes" ] - then - fsck -y ${cowdevice} - fi - else - log_warning_msg "Unable to find the persistent medium" - cowdevice="tmpfs" - cow_fstype="tmpfs" - cow_mountopt="rw,noatime,mode=755" + snapshots="${root_snapshot_label} ${home_snapshot_label}" fi - elif [ -n "${NFS_COW}" ] && [ -z "${NOPERSISTENT}" ] + + local root_snapdata="" + local home_snapdata="" + local overlay_devices="" + for media in $(find_persistence_media "${overlays}" "${snapshots}" "${whitelistdev}") + do + media="$(echo ${media} | tr ":" " ")" + case ${media} in + ${root_snapshot_label}=*|${old_root_snapshot_label}=*) + if [ -z "${root_snapdata}" ] + then + root_snapdata="${media#*=}" + fi + ;; + ${home_snapshot_label}=*) + # This second type should be removed when snapshot will get smarter, + # hence when "/etc/live-snapshot*list" will be supported also by + # ext2|ext3|ext4|jffs2 snapshot types. + if [ -z "${home_snapdata}" ] + then + home_snapdata="${media#*=}" + fi + ;; + ${old_root_overlay_label}=*) + device="${media#*=}" + fix_backwards_compatibility ${device} / union + overlay_devices="${overlay_devices} ${device}" + ;; + ${old_home_overlay_label}=*) + device="${media#*=}" + fix_backwards_compatibility ${device} /home bind + overlay_devices="${overlay_devices} ${device}" + ;; + ${custom_overlay_label}=*) + device="${media#*=}" + overlay_devices="${overlay_devices} ${device}" + ;; + esac + done + elif [ -n "${NFS_COW}" ] && [ -z "${NOPERSISTENCE}" ] then # check if there are any nfs options if echo ${NFS_COW}|grep -q ',' @@ -1320,6 +1060,12 @@ setup_unionfs () nfs_cow_opts="-o nolock" nfs_cow=${NFS_COW} fi + + if [ -n "${PERSISTENCE_READONLY}" ] + then + nfs_cow_opts="${nfs_cow_opts},nocto,ro" + fi + mac="$(get_mac)" if [ -n "${mac}" ] then @@ -1328,35 +1074,51 @@ setup_unionfs () else panic "unable to determine mac address" fi - else + fi + + if [ -z "${cowdevice}" ] + then cowdevice="tmpfs" cow_fstype="tmpfs" 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 [ -n "${PERSISTENCE_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ] + then + mount -t tmpfs -o rw,noatime,mode=755 tmpfs "/live/overlay" + root_backing="/live/persistence/$(basename ${cowdevice})-root" + mkdir -p ${root_backing} + else + root_backing="/live/overlay" + fi + + if [ "${cow_fstype}" = "nfs" ] + then + log_begin_msg \ + "Trying nfsmount ${nfs_cow_opts} ${cowdevice} ${root_backing}" + nfsmount ${nfs_cow_opts} ${cowdevice} ${root_backing} || \ + panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on ${root_backing}" + else + mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} ${root_backing} || \ + panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on ${root_backing}" + fi fi rofscount=$(echo ${rofslist} |wc -w) - if [ -n "${EXPOSED_ROOT}" ] + # XXX: we now ensure that there can only be one read-only filesystem. Should this be inside the EXPOSED_ROOT if? + 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 @@ -1364,83 +1126,62 @@ setup_unionfs () else cow_dirs='' fi - - for dir in ${cow_dirs}; do - mkdir -p /cow${dir} - - 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 - ;; - - *) - 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 - 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 - ;; - - *) - 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}" - ;; - esac + cow_dirs="/" fi - # Correct the permissions of /: - chmod 0755 "${rootmnt}" - - # tmpfs file systems - touch /etc/fstab - mkdir -p "${rootmnt}/live" - mount -t tmpfs tmpfs ${rootmnt}/live - - # Adding other custom mounts - if [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ] + if [ "${cow_fstype}" != "tmpfs" ] && [ "${cow_dirs}" != "/" ] && [ "${UNIONTYPE}" = "unionmount" ] then - # directly mount /home - # FIXME: add a custom mounts configurable system + true # FIXME: Maybe it does, I don't really know. + #panic "unionmount does not support subunions (${cow_dirs})." + fi - if [ -b "${homecow}" ] + for dir in ${cow_dirs}; do + unionmountpoint="${rootmnt}${dir}" + mkdir -p ${unionmountpoint} + if [ "${UNIONTYPE}" = "unionmount" ] then - mount -t $(get_fstype "${homecow}") -o rw,noatime "${homecow}" "${rootmnt}/home" - export HOMEMOUNTED=1 # used to proper calculate free space in do_snap_copy() + # FIXME: handle PERSISTENCE_READONLY + unionmountopts="-t ${cow_fstype} -o noatime,union,${cow_mountopt} ${cowdevice}" + mount_full $unionmountopts "${unionmountpoint}" else - log_warning_msg "Unable to find the persistent home medium" - fi + cow_dir="/live/overlay${dir}" + rofs_dir="${rofs}${dir}" + mkdir -p ${cow_dir} + if [ -n "${PERSISTENCE_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ] + then + do_union ${unionmountpoint} ${cow_dir} ${root_backing} ${rofs_dir} + else + do_union ${unionmountpoint} ${cow_dir} ${rofs_dir} + fi + fi || panic "mount ${UNIONTYPE} on ${unionmountpoint} failed with option ${unionmountopts}" + done - # Look for other snapshots to copy in - try_snap "${root_snapdata}" "${rootmnt}" "ROOT" - # This second type should be removed when snapshot grow smarter - try_snap "${home_snapdata}" "${rootmnt}/home" "HOME" - fi + # Correct the permissions of /: + chmod 0755 "${rootmnt}" - if [ -n "${SHOWMOUNTS}" ] + live_rofs_list="" + # SHOWMOUNTS is necessary for custom mounts with the union option + # Since we may want to do custom mounts in user-space it's best to always enable SHOWMOUNTS + if true #[ -n "${SHOWMOUNTS}" ] || ( [ -n "${PERSISTENCE}" ] && [ -z "${NOPERSISTENCE}" ] 1) then + # XXX: is the for loop really necessary? rofslist can only contain one item (see above XXX about EXPOSEDROOT) and this is also assumed elsewhere above (see use of $rofs above). for d in ${rofslist} do - mkdir -p "${rootmnt}/live/${d##*/}" - + live_rofs="/live/rofs/${d##*/}" + live_rofs_list="${live_rofs_list} ${live_rofs}" + mkdir -p "${live_rofs}" case d in *.dir) - # do nothing # mount -o bind "${d}" "${rootmnt}/live/${d##*/}" + # do nothing # mount -o bind "${d}" "${live_rofs}" ;; - *) case "${UNIONTYPE}" in unionfs-fuse) - mount -o bind "${d}" "${rootmnt}/live/${d##*/}" + mount -o bind "${d}" "${live_rofs}" ;; - *) - mount -o move "${d}" "${rootmnt}/live/${d##*/}" + mount -o move "${d}" "${live_rofs}" ;; esac ;; @@ -1448,9 +1189,44 @@ setup_unionfs () done fi - # shows cow fs on /cow for use by live-snapshot - mkdir -p "${rootmnt}/live/cow" - mount -o move /cow "${rootmnt}/live/cow" >/dev/null 2>&1 || mount -o bind /cow "${rootmnt}/live/cow" || log_warning_msg "Unable to move or bind /cow to ${rootmnt}/live/cow" + # Adding custom persistence + if [ -n "${PERSISTENCE}" ] && [ -z "${NOPERSISTENCE}" ] + then + local custom_mounts="/tmp/custom_mounts.list" + rm -rf ${custom_mounts} 2> /dev/null + + # Gather information about custom mounts from devies detected as overlays + get_custom_mounts ${custom_mounts} ${overlay_devices} + + [ -n "${DEBUG}" ] && cp ${custom_mounts} "/live/persistence" + + # Now we do the actual mounting (and symlinking) + local used_overlays="" + used_overlays=$(activate_custom_mounts ${custom_mounts}) + rm ${custom_mounts} + + # Close unused overlays (e.g. due to missing $persistence_list) + for overlay in ${overlay_devices} + do + if echo ${used_overlays} | grep -qve "^\(.* \)\?${device}\( .*\)\?$" + then + close_persistence_media ${overlay} + fi + done + + # Look for other snapshots to copy in + [ -n "${root_snapdata}" ] && try_snap "${root_snapdata}" "${rootmnt}" "ROOT" + # This second type should be removed when snapshot grow smarter + [ -n "${home_snapdata}" ] && try_snap "${home_snapdata}" "${rootmnt}" "HOME" "/home" + fi + + mkdir -p "${rootmnt}/live" + mount -o move /live "${rootmnt}/live" >/dev/null 2>&1 || mount -o bind /live "${rootmnt}/live" || log_warning_msg "Unable to move or bind /live to ${rootmnt}/live" + + # shows cow fs on /overlay for use by live-snapshot + mkdir -p "${rootmnt}/live/overlay" + mount -o move /live/overlay "${rootmnt}/live/overlay" >/dev/null 2>&1 || mount -o bind /overlay "${rootmnt}/live/overlay" || log_warning_msg "Unable to move or bind /overlay to ${rootmnt}/live/overlay" + } check_dev () @@ -1479,13 +1255,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 @@ -1506,6 +1288,35 @@ check_dev () umount $mountpoint fi fi + + IFS="," + for device in ${devname} + do + case "$device" in + *mapper*) + # Adding lvm support + if [ -x /scripts/local-top/lvm2 ] + then + ROOT="$device" resume="" /scripts/local-top/lvm2 + fi + ;; + + /dev/md*) + # Adding raid support + if [ -x /scripts/local-top/mdadm ] + then + cp /conf/conf.d/md /conf/conf.d/md.orig + echo "MD_DEVS=$device " >> /conf/conf.d/md + /scripts/local-top/mdadm + mv /conf/conf.d/md.orig /conf/conf.d/md + fi + ;; + esac + done + unset IFS + + [ -n "$device" ] && devname="$device" + [ -e "$devname" ] || continue if [ -n "${LIVE_MEDIA_OFFSET}" ] @@ -1523,13 +1334,28 @@ check_dev () mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue [ -n "$devuid" ] && echo "$devuid" >> $tried + if [ -n "${FINDISO}" ] + then + if [ -f ${mountpoint}/${FINDISO} ] + then + umount ${mountpoint} + mkdir -p /live/findiso + mount -t ${fstype} -o ro,noatime "${devname}" /live/findiso + loopdevname=$(setup_loop "/live/findiso/${FINDISO}" "loop" "/sys/block/loop*" 0 "") + devname="${loopdevname}" + mount -t iso9660 -o ro,noatime "${devname}" ${mountpoint} + else + umount ${mountpoint} + fi + fi + if is_live_path ${mountpoint} && \ ([ "${skip_uuid_check}" ] || matches_uuid ${mountpoint}) then echo ${mountpoint} return 0 else - umount ${mountpoint} + umount ${mountpoint} 2>/dev/null fi fi @@ -1557,39 +1383,29 @@ find_livefs () # 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)") + for sysblock in $(removable_usb_dev "sys") do - if [ "$(cat ${sysblock}/removable)" = "1" ] - then - if readlink ${sysblock} | grep -q usb || - readlink ${sysblock}/device | grep -q usb # linux < 2.6.29 + for dev in $(subdevices "${sysblock}") + do + if check_dev "${dev}" then - for dev in $(subdevices "${sysblock}") - do - if check_dev "${dev}" - then - return 0 - fi - done + return 0 fi - fi + done done return 1 ;; removable) - for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)") + for sysblock in $(removable_dev "sys") do - if [ "$(cat ${sysblock}/removable)" = "1" ] - then - for dev in $(subdevices "${sysblock}") - do - if check_dev "${dev}" - then - return 0 - fi - done - fi + for dev in $(subdevices "${sysblock}") + do + if check_dev "${dev}" + then + return 0 + fi + done done return 1 ;; @@ -1607,16 +1423,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' | egrep -v "/(loop|ram|dm-|fd)") - do - if [ "$(cat ${sysblock}/removable)" = "1" ] - then - removable_devices_to_scan="$removable_devices_to_scan $sysblock" - else - nonremovable_devices_to_scan="$nonremovable_devices_to_scan $sysblock" - fi - done - devices_to_scan="$removable_devices_to_scan $nonremovable_devices_to_scan" + devices_to_scan="$(removable_dev 'sys') $(non_removable_dev 'sys')" for sysblock in $devices_to_scan do @@ -1640,6 +1447,7 @@ find_livefs () fi done elif [ "${fstype}" = "squashfs" -o \ + "${fstype}" = "btrfs" -o \ "${fstype}" = "ext2" -o \ "${fstype}" = "ext3" -o \ "${fstype}" = "ext4" -o \ @@ -1657,16 +1465,6 @@ find_livefs () return 1 } -set_usplash_timeout () -{ - if [ -x /sbin/usplash_write ] - then - /sbin/usplash_write "TIMEOUT 120" - else if [ -x /sbin/splashy_update ] ; then - /sbin/splashy_update "TIMEOUT 120" - fi ; fi -} - integrity_check () { media_mountpoint="${1}" @@ -1693,25 +1491,17 @@ integrity_check () fi } -start_usplash_pulse () -{ - if [ -x /sbin/usplash_write ] - then - /sbin/usplash_write "PULSELOGO" - fi -} - 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 @@ -1719,9 +1509,6 @@ mountroot () Arguments - set_usplash_timeout - start_usplash_pulse - maybe_break live-premount log_begin_msg "Running /scripts/live-premount" run_scripts /scripts/live-premount @@ -1730,8 +1517,6 @@ mountroot () # Needed here too because some things (*cough* udev *cough*) # changes the timeout - set_usplash_timeout - if [ ! -z "${NETBOOT}" ] || [ ! -z "${FETCH}" ] || [ ! -z "${HTTPFS}" ] || [ ! -z "${FTPFS}" ] then if do_netmount @@ -1741,11 +1526,28 @@ mountroot () panic "Unable to find a live file system on the network" fi else - if [ -n "${PLAIN_ROOT}" ] && [ -n "${ROOT}" ] + if [ -n "${ISCSI_PORTAL}" ] + then + do_iscsi && livefs_root="${mountpoint}" + elif [ -n "${PLAIN_ROOT}" ] && [ -n "${ROOT}" ] then # Do a local boot from hd livefs_root=${ROOT} else + if [ -x /usr/bin/memdiskfind ] + then + MEMDISK=$(/usr/bin/memdiskfind) + + if [ $? -eq 0 ] + then + # We found a memdisk, set up phram + modprobe phram phram=memdisk,${MEMDISK} + + # Load mtdblock, the memdisk will be /dev/mtdblock0 + modprobe mtdblock + fi + fi + # Scan local devices for the image i=0 while [ "$i" -lt 60 ] @@ -1806,6 +1608,11 @@ mountroot () mount_images_in_directory "${livefs_root}" "${rootmnt}" "${mac}" fi + + if [ -n "${ROOT_PID}" ] ; then + echo "${ROOT_PID}" > "${rootmnt}"/live/root.pid + fi + log_end_msg # unionfs-fuse needs /dev to be bind-mounted for the duration of @@ -1822,6 +1629,53 @@ mountroot () mount --move /live/image /root/live/image fi + # aufs2 in kernel versions around 2.6.33 has a regression: + # directories can't be accessed when read for the first the time, + # causing a failure for example when accessing /var/lib/fai + # when booting FAI, this simple workaround solves it + ls /root/* >/dev/null 2>&1 + + # Move findiso directory to the new root filesystem so that programs there can get at it. + if [ -d /live/findiso ] && [ ! -d /root/live/findiso ] + then + mkdir -p /root/live/findiso + mount -n --move /live/findiso /root/live/findiso + fi + + # if we do not unmount the ISO we can't run "fsck /dev/ice" later on + # because the mountpoint is left behind in /proc/mounts, so let's get + # rid of it when running from RAM + if [ -n "$FINDISO" ] && [ "${TORAM}" ] + then + losetup -d /dev/loop0 + + if is_mountpoint /live/findiso + then + umount /root/live/findiso + rmdir --ignore-fail-on-non-empty /root/live/findiso \ + >/dev/null 2>&1 || true + fi + fi + + # copy snapshot configuration if exists + if [ -f snapshot.conf ] + then + log_begin_msg "Copying snapshot.conf to ${rootmnt}/etc/live/boot.d" + if [ ! -d "${rootmnt}/etc/live/boot.d" ] + then + mkdir -p "${rootmnt}/etc/live/boot.d" + fi + cp snapshot.conf "${rootmnt}/etc/live/boot.d/" + 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" @@ -1836,9 +1690,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 - if [ -f /etc/live.conf ] - then - cp /etc/live.conf "${rootmnt}/etc/" - fi + [ -w "${rootmnt}/var/log/" ] && cp live-boot.log "${rootmnt}/var/log/" 2>/dev/null }