X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=95673018acf8c1f5076c31867c6f77f70ded71ca;hb=7c563d53a8726c6769a113045e5fae01bdc0a8a6;hp=ebac3aec7d87149fe97896ce1f68983676fcf583;hpb=7340552de6a8e238e54582722ccf7b74d12a212b;p=live-boot-grml.git diff --git a/scripts/live b/scripts/live index ebac3ae..9567301 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) @@ -79,6 +78,11 @@ Arguments () export USERFULLNAME LIVECONF ;; + ignore_uuid) + IGNORE_UUID="Yes" + export IGNORE_UUID + ;; + ip=*) STATICIP="${ARGUMENT#ip=}" @@ -367,6 +371,11 @@ Arguments () export TORAM MODULETORAM ;; + exposedroot) + EXPOSED_ROOT="Yes" + export EXPOSED_ROOT + ;; + union=*) UNIONTYPE="${ARGUMENT#union=}" export UNIONTYPE @@ -434,6 +443,31 @@ is_live_path () return 1 } +matches_uuid () +{ + if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ] + then + return 0 + fi + + path="${1}" + uuid="$(cat /conf/uuid.conf)" + + for try_uuid_file in "${mountpoint}/.disk/casper-uuid"* + do + [ -e "${try_uuid_file}" ] || continue + + try_uuid="$(cat "${try_uuid_file}")" + + if [ "${uuid}" = "${try_uuid}" ] + then + return 0 + fi + done + + return 1 +} + get_backing_device () { case "${1}" in @@ -588,7 +622,7 @@ do_netmount () { rc=1 - modprobe "${MP_QUIET}" af_packet # For DHCP + modprobe -q af_packet # For DHCP udevtrigger udevsettle @@ -658,7 +692,7 @@ do_nfsmount () { rc=1 - modprobe "${MP_QUIET}" nfs + modprobe -q nfs if [ -z "${NFSOPTS}" ] then @@ -691,7 +725,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 @@ -732,7 +766,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 @@ -831,7 +865,7 @@ setup_unionfs () image_directory="${1}" rootmnt="${2}" - modprobe "${MP_QUIET}" -b ${UNIONTYPE} + 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, @@ -908,7 +942,7 @@ 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 @@ -932,9 +966,40 @@ setup_unionfs () fi fi - mount ${cowdevice} -t ${cow_fstype} -o rw,noatime,nodiratime /cow || panic "Can not mount ${cowdevice} on /cow" + rofscount=$(echo ${rofslist} |wc -w) - mount -t ${UNIONTYPE} -o noatime,nodiratime,dirs=/cow=rw:${rofsstring} ${UNIONTYPE} "${rootmnt}" || panic "${UNIONTYPE} mount failed" + 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 ${cowdevice} -t ${cow_fstype} -o rw,noatime /cow || \ + panic "Can not mount ${cowdevice} on /cow" + + cow_dirs='/tmp /var/tmp /var/lock /var/run /var/log /var/spool + /home /live /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 ${cowdevice} -t ${cow_fstype} -o rw,noatime /cow || \ + panic "Can not mount ${cowdevice} on /cow" + 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 # Adding other custom mounts if [ -n "${PERSISTENT}" ] @@ -945,7 +1010,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" @@ -983,6 +1048,7 @@ check_dev () { sysdev="${1}" devname="${2}" + skip_uuid_check="${3}" if [ -z "${devname}" ] then @@ -999,9 +1065,10 @@ 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} + if is_live_path ${mountpoint} && \ + ([ "${skip_uuid_check}" ] || matches_uuid ${mountpoint}) then echo ${mountpoint} return 0 @@ -1025,7 +1092,7 @@ find_livefs () # first look at the one specified in the command line if [ ! -z "${LIVE_MEDIA}" ] then - if check_dev "null" "${LIVE_MEDIA}" + if check_dev "null" "${LIVE_MEDIA}" "skip_uuid_check" then return 0 fi