X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=af8c12e8aba95d41df97dc566fd8f60d14a5a75c;hb=49f4d23bf89af431c787138641bdc6a61e042794;hp=494abc7061834d79eb56e7f30058021f3c7d0d05;hpb=e2d2d40b67bdbbef25f1b53f4fbc2eedc72f12cd;p=live-boot-grml.git diff --git a/scripts/live b/scripts/live index 494abc7..af8c12e 100755 --- a/scripts/live +++ b/scripts/live @@ -11,14 +11,6 @@ mountpoint="/live/image" alt_mountpoint="/media" LIVE_MEDIA_PATH="live" -root_overlay_label="full-ov" -custom_overlay_label="custom-ov" -root_snapshot_label="live-sn" -home_snapshot_label="home-sn" -persistence_list="live.persist" - -USERNAME="user" -USERFULLNAME="Live user" HOSTNAME="host" mkdir -p "${mountpoint}" @@ -42,394 +34,6 @@ then touch /live.vars fi -Arguments () -{ - PRESEEDS="" - LOCATIONS="" - - for ARGUMENT in $(cat /proc/cmdline) - do - case "${ARGUMENT}" in - skipconfig) - NOACCESSIBILITY="Yes" - NOFASTBOOT="Yes" - NOFSTAB="Yes" - NONETWORKING="Yes" - - export NOACCESSIBILITY NOFASTBOOT NOFSTAB NONETWORKING - ;; - - access=*) - ACCESS="${ARGUMENT#access=}" - export ACCESS - ;; - - console=*) - DEFCONSOLE="${ARGUMENT#*=}" - export DEFCONSOLE - ;; - - BOOTIF=*) - BOOTIF="${x#BOOTIF=}" - ;; - - debug) - DEBUG="Yes" - export DEBUG - - 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=}" - ETHDEVICE="${DEVICE}" - export DEVICE 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 - ;; - - iscsi=*) - ISCSI="${ARGUMENT#iscsi=}" - #ip:port - separated by ; - ISCSI_PORTAL="${ISCSI%;*}" - if echo "${ISCSI_PORTAL}" | grep -q , ; then - ISCSI_SERVER="${ISCSI_PORTAL%,*}" - ISCSI_PORT="${ISCSI_PORTAL#*,}" - fi - #target name - ISCSI_TARGET="${ISCSI#*;}" - export ISCSI ISCSI_PORTAL ISCSI_TARGET ISCSI_SERVER ISCSI_PORT - ;; - - isofrom=*|fromiso=*) - FROMISO="${ARGUMENT#*=}" - export FROMISO - ;; - - 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 - ;; - - 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 - ;; - - nofastboot) - NOFASTBOOT="Yes" - export NOFASTBOOT - ;; - - nofstab) - NOFSTAB="Yes" - export NOFSTAB - ;; - - nonetworking) - NONETWORKING="Yes" - export NONETWORKING - ;; - - ramdisk-size=*) - ramdisk_size="${ARGUMENT#ramdisk-size=}" - ;; - - swapon) - SWAPON="Yes" - export SWAPON - ;; - - persistent) - PERSISTENT="Yes" - export PERSISTENT - ;; - - persistent-encryption=*) - PERSISTENT_ENCRYPTION="${ARGUMENT#*=}" - export PERSISTENT_ENCRYPTION - ;; - - persistent-media=*) - PERSISTENT_MEDIA="${ARGUMENT#*=}" - export PERSISTENT_MEDIA - ;; - persistent-method=*) - PERSISTENT_METHOD="${ARGUMENT#*=}" - export PERSISTENT_METHOD - ;; - - persistent-path=*) - PERSISTENT_PATH="${ARGUMENT#persistent-path=}" - export PERSISTENT_PATH - ;; - persistent-read-only) - PERSISTENT_READONLY="Yes" - export PERSISTENT_READONLY - ;; - - persistent-storage=*) - PERSISTENT_STORAGE="${ARGUMENT#persistent-storage=}" - export PERSISTENT_STORAGE - ;; - - persistent-subtext=*) - root_overlay_label="${root_overlay_label}-${ARGUMENT#persistent-subtext=}" - custom_overlay_label="${custom_overlay_label}-${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 - ;; - - noprompt) - NOPROMPT="Yes" - export NOPROMPT - ;; - - noprompt=*) - NOPROMPT="${ARGUMENT#noprompt=}" - export NOPROMPT - ;; - - quickusbmodules) - QUICKUSBMODULES="Yes" - export QUICKUSBMODULES - ;; - - preseed/file=*|file=*) - LOCATIONS="${ARGUMENT#*=} ${LOCATIONS}" - export LOCATIONS - ;; - - nopreseed) - NOPRESEED="Yes" - export NOPRESEED - ;; - - */*=*) - question="${ARGUMENT%%=*}" - value="${ARGUMENT#*=}" - PRESEEDS="${PRESEEDS}\"${question}=${value}\" " - export PRESEEDS - ;; - - showmounts) - SHOWMOUNTS="Yes" - export SHOWMOUNTS - ;; - - silent) - SILENT="Yes" - export SILENT - ;; - - 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 - ;; - 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 - - if [ -z "${PERSISTENT_ENCRYPTION}" ] - then - PERSISTENT_ENCRYPTION="none" - export PERSISTENT_ENCRYPTION - elif echo ${PERSISTENT_ENCRYPTION} | grep -qe "\" - then - if ! modprobe dm-crypt - then - log_warning_msg "Unable to load module dm-crypt" - PERSISTENT_ENCRYPTION=$(echo ${PERSISTENT_ENCRYPTION} | sed -e 's/\> snapshot.conf # for resync on reboot/halt fi @@ -1348,10 +952,14 @@ setup_unionfs () log_end_msg fi - mkdir -p /cow + # tmpfs file systems + touch /etc/fstab + mkdir -p /live + mount -t tmpfs tmpfs /live + mkdir -p /live/overlay - # Looking for persistent devices or files - if [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ] + # Looking for persistence devices or files + if [ -n "${PERSISTENCE}" ] && [ -z "${NOPERSISTENCE}" ] then if [ -z "${QUICKUSBMODULES}" ] @@ -1381,7 +989,7 @@ setup_unionfs () done fi - case "${PERSISTENT_MEDIA}" in + case "${PERSISTENCE_MEDIA}" in removable) whitelistdev="$(removable_dev)" ;; @@ -1393,25 +1001,24 @@ setup_unionfs () ;; esac - if echo ${PERSISTENT_METHOD} | grep -qe "\" + if echo ${PERSISTENCE_METHOD} | grep -qe "\" then - overlays="${root_overlay_label} ${custom_overlay_label}" + overlays="${old_root_overlay_label} ${old_home_overlay_label} ${custom_overlay_label}" fi - if echo ${PERSISTENT_METHOD} | grep -qe "\" + if echo ${PERSISTENCE_METHOD} | grep -qe "\" then snapshots="${root_snapshot_label} ${home_snapshot_label}" fi local root_snapdata="" local home_snapshot_label="" - local root_overlay_label="" local overlay_devices="" - for media in $(find_persistent_media "${overlays}" "${snapshots}" "${blacklistdev}" "${whitelistdev}") + for media in $(find_persistence_media "${overlays}" "${snapshots}" "${whitelistdev}") do media="$(echo ${media} | tr ":" " ")" case ${media} in - ${root_snapshot_label}=*) + ${root_snapshot_label}=*|${old_root_snapshot_label}=*) if [ -z "${root_snapdata}" ] then root_snapdata="${media#*=}" @@ -1426,12 +1033,15 @@ setup_unionfs () home_snapdata="${media#*=}" fi ;; - ${root_overlay_label}=*) - if [ -z "${root_overlay_device}" ] - then - device="${media#*=}" - root_overlay_device="${device}" - 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#*=}" @@ -1439,27 +1049,7 @@ setup_unionfs () ;; esac done - - if [ -b "${root_overlay_device}" ] - then - PERSISTENCE_IS_ON="1" - export PERSISTENCE_IS_ON - - cowdevice=${root_overlay_device} - cow_fstype=$(get_fstype "${root_overlay_device}") - if [ -z "${PERSISTENT_READONLY}" ] - then - cow_mountopt="rw,noatime" - else - cow_mountopt="ro,noatime" - fi - - if [ "${FORCEPERSISTENTFSCK}" = "Yes" ] - then - fsck -y ${cowdevice} - fi - fi - elif [ -n "${NFS_COW}" ] && [ -z "${NOPERSISTENT}" ] + elif [ -n "${NFS_COW}" ] && [ -z "${NOPERSISTENCE}" ] then # check if there are any nfs options if echo ${NFS_COW}|grep -q ',' @@ -1471,7 +1061,7 @@ setup_unionfs () nfs_cow=${NFS_COW} fi - if [ -n "${PERSISTENT_READONLY}" ] + if [ -n "${PERSISTENCE_READONLY}" ] then nfs_cow_opts="${nfs_cow_opts},nocto,ro" fi @@ -1495,13 +1085,13 @@ setup_unionfs () if [ "${UNIONTYPE}" != "unionmount" ] then - if [ -n "${PERSISTENT_READONLY}" ] + if [ -n "${PERSISTENCE_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ] then - mount -t tmpfs -o rw,noatime,mode=755 tmpfs "/cow" - root_backing="${rootmnt}/live/persistent/$(basename ${cowdevice})-root" + 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="/cow" + root_backing="/live/overlay" fi if [ "${cow_fstype}" = "nfs" ] @@ -1551,16 +1141,15 @@ setup_unionfs () mkdir -p ${unionmountpoint} if [ "${UNIONTYPE}" = "unionmount" ] then - # FIXME: handle PERSISTENT_READONLY + # FIXME: handle PERSISTENCE_READONLY unionmountopts="-t ${cow_fstype} -o noatime,union,${cow_mountopt} ${cowdevice}" mount_full $unionmountopts "${unionmountpoint}" else - cow_dir="/cow${dir}" + cow_dir="/live/overlay${dir}" rofs_dir="${rofs}${dir}" mkdir -p ${cow_dir} - if [ -n "${PERSISTENT_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ] + if [ -n "${PERSISTENCE_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ] then - #mount -t tmpfs -o rw,noatime,mode=755 tmpfs "${cow_dir}" do_union ${unionmountpoint} ${cow_dir} ${root_backing} ${rofs_dir} else do_union ${unionmountpoint} ${cow_dir} ${rofs_dir} @@ -1571,20 +1160,15 @@ setup_unionfs () # Correct the permissions of /: chmod 0755 "${rootmnt}" - # tmpfs file systems - touch /etc/fstab - mkdir -p "${rootmnt}/live" - mount -t tmpfs tmpfs ${rootmnt}/live - 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 "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ] 1) + 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 - live_rofs="${rootmnt}/live/rofs/${d##*/}" + live_rofs="/live/rofs/${d##*/}" live_rofs_list="${live_rofs_list} ${live_rofs}" mkdir -p "${live_rofs}" case d in @@ -1605,30 +1189,44 @@ setup_unionfs () done fi - # Adding custom persistent - if [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ] + # Adding custom persistence + if [ -n "${PERSISTENCE}" ] && [ -z "${NOPERSISTENCE}" ] then - local custom_mounts="/custom_mounts.list" + 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 ${overlay_devices} ${custom_mounts} ${rootmnt} + get_custom_mounts ${custom_mounts} ${overlay_devices} - [ "${DEBUG}" = "Yes" ] && cp ${custom_mounts} "${rootmnt}/live/persistent" + [ -n "${DEBUG}" ] && cp ${custom_mounts} "/live/persistence" # Now we do the actual mounting (and symlinking) - do_custom_mounts ${custom_mounts} ${rootmnt} + 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 try_snap "${root_snapdata}" "${rootmnt}" "ROOT" # This second type should be removed when snapshot grow smarter try_snap "${home_snapdata}" "${rootmnt}" "HOME" "/home" 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" + 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 () @@ -1736,6 +1334,21 @@ 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 @@ -2022,6 +1635,28 @@ mountroot () # 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