X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=03905b52c1af67a0246186dc2bfe2264058fc36e;hb=be8a9f032ea3208dd50272631047ef8986edf7bf;hp=b883c92c711b5e488e952d32da75400adb3c7704;hpb=2a2c02a56d85eb705edd1caf1294c1685c1ac7db;p=live-boot-grml.git diff --git a/scripts/live b/scripts/live index b883c92..03905b5 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 @@ -36,7 +35,7 @@ Arguments () { PRESEEDS="" - for ARGUMENT in `cat /proc/cmdline` + for ARGUMENT in $(cat /proc/cmdline) do case "${ARGUMENT}" in access=*) @@ -46,7 +45,7 @@ Arguments () console=*) DEFCONSOLE="${ARGUMENT#*=}" - export DEFCONFSOLE + export DEFCONSOLE ;; debug) @@ -61,6 +60,11 @@ Arguments () export FETCH ;; + hook=*) + HOOK="${ARGUMENT#hook=}" + export HOOK + ;; + hostname=*) HOSTNAME="${ARGUMENT#hostname=}" LIVECONF="changed" @@ -79,6 +83,11 @@ Arguments () export USERFULLNAME LIVECONF ;; + ignore_uuid) + IGNORE_UUID="Yes" + export IGNORE_UUID + ;; + ip=*) STATICIP="${ARGUMENT#ip=}" @@ -165,6 +174,11 @@ Arguments () export NFSOPTS ;; + nfscow=*) + NFS_COW="${ARGUMENT#nfscow=}" + export NFS_COW + ;; + noaccessibility) NOACCESSIBILITY="Yes" export NOACCESSIBILITY @@ -220,11 +234,6 @@ Arguments () export NOKPERSONALIZER ;; - nokwallet) - NOKWALLET="Yes" - export NOKWALLET - ;; - nolanguageselector) NOLANGUAGESELECTOR="Yes" export NOLANGUAGESELECTOR @@ -313,15 +322,15 @@ Arguments () mount -n -o bind /dev /root/dev mkdir -p /root/var/run/network - chroot /root ifup -a - chroot /root wget -P /tmp "$location" - chroot /root ifdown -a + chroot /root dhclient eth0 + chroot /root wget -P /tmp "${location}" + chroot /root ifconfig eth0 down umount /root/sys umount /root/proc umount /root/dev - LOCATION="/tmp/$(basename "$location")" + LOCATION="/tmp/$(basename "${location}")" ;; */*=*) @@ -336,6 +345,11 @@ Arguments () export SHOWMOUNTS ;; + textonly) + TEXTONLY="Yes" + export TEXTONLY + ;; + timezone=*) TIMEZONE="${ARGUMENT#timezone=}" export TIMEZONE @@ -362,6 +376,21 @@ Arguments () export TORAM MODULETORAM ;; + exposedroot) + EXPOSED_ROOT="Yes" + export EXPOSED_ROOT + ;; + + plainroot) + PLAIN_ROOT="Yes" + export PLAIN_ROOT + ;; + + root=*) + ROOT="${ARGUMENT#root=}" + export ROOT + ;; + union=*) UNIONTYPE="${ARGUMENT#union=}" export UNIONTYPE @@ -377,6 +406,11 @@ Arguments () export XDEBCONF ;; + xdriver=*) + XDRIVER="${ARGUMENT#xdriver=}" + export XDRIVER + ;; + xvideomode=*) XVIDEOMODE="${ARGUMENT#xvideomode=}" export XVIDEOMODE @@ -417,9 +451,9 @@ is_live_path () if [ -d "${DIRECTORY}"/"${LIVE_MEDIA_PATH}" ] then - for FILESYSTEM in squashfs ext2 ext3 xfs dir + for FILESYSTEM in squashfs ext2 ext3 xfs dir jffs2 do - if [ "`echo ${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM}`" != "${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM}" ] + if [ "$(echo ${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM})" != "${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM}" ] then return 0 fi @@ -429,11 +463,36 @@ 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 - *.squashfs|*.ext2|*.ext3) - echo $(setup_loop "$1" "loop" "/sys/block/loop*" '0' "${LIVE_MEDIA_ENCRYPTION}") + case "${1}" in + *.squashfs|*.ext2|*.ext3|*.jffs2) + echo $(setup_loop "${1}" "loop" "/sys/block/loop*" '0' "${LIVE_MEDIA_ENCRYPTION}") ;; *.dir) @@ -441,17 +500,17 @@ get_backing_device () ;; *) - panic "Unrecognized live filesystem: $1" + panic "Unrecognized live filesystem: ${1}" ;; esac } match_files_in_dir () { - # Does any files match pattern $1 ? - local pattern="$1" + # Does any files match pattern ${1} ? + local pattern="${1}" - if [ "$(echo $pattern)" != "$pattern" ] + if [ "$(echo ${pattern})" != "${pattern}" ] then return 0 fi @@ -461,15 +520,19 @@ match_files_in_dir () mount_images_in_directory () { - directory="$1" - rootmnt="$2" + directory="${1}" + rootmnt="${2}" + mac="${3}" - if match_files_in_dir "$directory/${LIVE_MEDIA_PATH}/*.squashfs" || - match_files_in_dir "$directory/${LIVE_MEDIA_PATH}/*.ext2" || - match_files_in_dir "$directory/${LIVE_MEDIA_PATH}/*.ext3" || - match_files_in_dir "$directory/${LIVE_MEDIA_PATH}/*.dir" + + if match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.squashfs" || + match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.ext2" || + match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.ext3" || + match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.jffs2" || + match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.dir" then - setup_unionfs "$directory/${LIVE_MEDIA_PATH}" "$rootmnt" + [ -n "${mac}" ] && adddirectory="${directory}/${LIVE_MEDIA_PATH}/${mac}" + setup_unionfs "${directory}/${LIVE_MEDIA_PATH}" "${rootmnt}" "${adddirectory}" else : fi @@ -493,7 +556,7 @@ is_supported_fs () fstype="${1}" case ${fstype} in - vfat|iso9660|udf|ext2|ext3|ntfs) + vfat|iso9660|udf|ext2|ext3|ntfs|jffs2) return 0 ;; esac @@ -517,7 +580,7 @@ copy_live_to () then size=$( expr $(ls -la ${MODULETORAMFILE} | awk '{print $5}') / 1024 + 5000 ) else - log_warning_msg "Error: toram-module $MODULETORAM ($MODULETORAMFILE) could not be read." + log_warning_msg "Error: toram-module ${MODULETORAM} (${MODULETORAMFILE}) could not be read." return 1 fi fi @@ -546,7 +609,7 @@ copy_live_to () if [ "${freespace}" -lt "${size}" ] then - [ "$quiet" != "y" ] && log_warning_msg "Not enough free ${free_string} (${freespace}k free, ${size}k needed) to copy live media in ${copytodev}." + [ "${quiet}" != "y" ] && log_warning_msg "Not enough free ${free_string} (${freespace}k free, ${size}k needed) to copy live media in ${copytodev}." return 1 fi @@ -555,7 +618,7 @@ copy_live_to () echo "mount -t ${fstype} ${mount_options} ${dev} ${copyto}" mount -t "${fstype}" ${mount_options} "${dev}" "${copyto}" - if [ "$extension" = "tgz" ] + if [ "${extension}" = "tgz" ] then cd "${copyto}" tar zxf "${copyfrom}/${LIVE_MEDIA_PATH}/$(basename ${FETCH})" @@ -583,7 +646,7 @@ do_netmount () { rc=1 - modprobe "${MP_QUIET}" af_packet # For DHCP + modprobe -q af_packet # For DHCP udevtrigger udevsettle @@ -591,9 +654,9 @@ do_netmount () ipconfig ${DEVICE} | tee /netboot.config # source relevant ipconfig output - OLDHOSTNAME=$HOSTNAME + OLDHOSTNAME=${HOSTNAME} . /tmp/net-${DEVICE}.conf - [ -z $HOSTNAME ] && HOSTNAME=$OLDHOSTNAME + [ -z ${HOSTNAME} ] && HOSTNAME=${OLDHOSTNAME} export HOSTNAME if [ "${NFSROOT}" = "auto" ] @@ -607,12 +670,12 @@ do_netmount () return ${rc} fi - if [ "${NFSROOT#*:}" = "$NFSROOT" ] && [ "$NETBOOT" != "cifs" ] + if [ "${NFSROOT#*:}" = "${NFSROOT}" ] && [ "$NETBOOT" != "cifs" ] then NFSROOT=${ROOTSERVER}:${NFSROOT} fi - [ "$quiet" != "y" ] && log_begin_msg "Trying netboot from ${NFSROOT}" + [ "${quiet}" != "y" ] && log_begin_msg "Trying netboot from ${NFSROOT}" if [ "${NETBOOT}" != "nfs" ] && do_cifsmount then @@ -624,26 +687,26 @@ do_netmount () rc=0 fi - [ "$quiet" != "y" ] && log_end_msg + [ "${quiet}" != "y" ] && log_end_msg return ${rc} } do_httpmount () { rc=1 - extension=`echo "${FETCH}" | sed 's/\(.*\)\.\(.*\)/\2/'` + extension=$(echo "${FETCH}" | sed 's/\(.*\)\.\(.*\)/\2/') case "${extension}" in squashfs|tgz|tar) - [ "$quiet" != "y" ] && log_begin_msg "Trying wget ${FETCH} -O ${mountpoint}/$(basename ${FETCH})" + [ "${quiet}" != "y" ] && log_begin_msg "Trying wget ${FETCH} -O ${mountpoint}/$(basename ${FETCH})" mkdir -p "${mountpoint}/${LIVE_MEDIA_PATH}" wget "${FETCH}" -O "${mountpoint}/${LIVE_MEDIA_PATH}/$(basename ${FETCH})" - [ $? -eq 0 ] && rc=0 - [ "${extension}" == "tgz" ] && live_dest="ram" + [ ${?} -eq 0 ] && rc=0 + [ "${extension}" = "tgz" ] && live_dest="ram" ;; *) - [ "$quiet" != "y" ] && log_begin_msg "Unrecognized archive extension for ${FETCH}" + [ "${quiet}" != "y" ] && log_begin_msg "Unrecognized archive extension for ${FETCH}" esac return ${rc} @@ -653,14 +716,14 @@ do_nfsmount () { rc=1 - modprobe "${MP_QUIET}" nfs + modprobe -q nfs if [ -z "${NFSOPTS}" ] then NFSOPTS="" fi - [ "$quiet" != "y" ] && log_begin_msg "Trying nfsmount -o nolock -o ro ${NFSOPTS} ${NFSROOT} ${mountpoint}" + [ "${quiet}" != "y" ] && log_begin_msg "Trying nfsmount -o nolock -o ro ${NFSOPTS} ${NFSROOT} ${mountpoint}" # FIXME: This for loop is an ugly HACK round an nfs bug for i in 0 1 2 3 4 5 6 7 8 9 a b c d e f 10 11 12 13 @@ -685,8 +748,8 @@ do_cifsmount () CIFSOPTS="${NFSOPTS}" fi - [ "$quiet" != "y" ] && log_begin_msg "Trying mount.cifs ${NFSROOT} ${mountpoint} ${CIFSOPTS}" - modprobe "${MP_QUIET}" cifs + [ "${quiet}" != "y" ] && log_begin_msg "Trying mount.cifs ${NFSROOT} ${mountpoint} ${CIFSOPTS}" + modprobe -q cifs if mount.cifs "${NFSROOT}" "${mountpoint}" "${CIFSOPTS}" then @@ -727,7 +790,7 @@ do_snap_copy () if [ -n "${fstype}" ] then # Copying stuff... - mount -t "${fstype}" -o ro "${fromdev}" "${tomount}" + mount -t "${fstype}" -o ro,noatime "${fromdev}" "${tomount}" cp -a "${tomount}"/* ${todir} umount "${tomount}" else @@ -745,19 +808,19 @@ do_snap_copy () else return 1 - [ "$quiet" != "y" ] && log_warning_msg "Unable to find the snapshot ${snap_type} medium" + [ "${quiet}" != "y" ] && log_warning_msg "Unable to find the snapshot ${snap_type} medium" fi } try_snap () { - # Look for $snap_label.* in block devices and copy the contents to $snap_mount + # Look for ${snap_label}.* in block devices and copy the contents to ${snap_mount} # and remember the device and filename for resync on exit in live-initramfs.init snap_label="${1}" snap_mount="${2}" snap_type="${3}" - snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2 ${snap_label}.ext3") + snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2 ${snap_label}.ext3 ${snap_label}.jffs2") if [ ! -z "${snapdata}" ] then @@ -765,9 +828,9 @@ try_snap () snapback="$(echo ${snapdata} | cut -f2 -d ' ')" snapfile="$(echo ${snapdata} | cut -f3 -d ' ')" - if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\|ext3\)' + if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\|ext3\|jffs2\)' then - # squashfs or ext2/ext3 snapshot + # squashfs, jffs2 or ext2/ext3 snapshot dev=$(get_backing_device "${snapback}/${snapfile}") if ! do_snap_copy "${dev}" "${snap_mount}" "${snap_type}" @@ -823,10 +886,10 @@ try_snap () setup_unionfs () { - image_directory="$1" - rootmnt="$2" - - modprobe "${MP_QUIET}" -b ${UNIONTYPE} + image_directory="${1}" + rootmnt="${2}" + addimage_directory="${3}" + 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, @@ -838,12 +901,15 @@ setup_unionfs () # Let's just mount the read-only file systems first rofsstring="" rofslist="" - minor_kernel_version=`uname -r|cut -c 5-|sed 's/[^0-9].*//'` + minor_kernel_version=$(uname -r|cut -c 5-|sed 's/[^0-9].*//') if [ "${NETBOOT}" = "nfs" ] && [ "${minor_kernel_version}" -lt 22 ] then # go aroung a bug in nfs-unionfs locking for unionfs <= 1.4 roopt="nfsro" + elif [ "${UNIONTYPE}" = "aufs" ] + then + roopt="rr" else roopt="ro" fi @@ -851,19 +917,19 @@ setup_unionfs () # Read image names from ${MODULE}.module if it exists if [ -e "${image_directory}/filesystem.${MODULE}.module" ] then - for IMAGE in `cat ${image_directory}/filesystem.${MODULE}.module` + for IMAGE in $(cat ${image_directory}/filesystem.${MODULE}.module) do - image_string="${image_string} ${image_directory}/${image}" + image_string="${image_string} ${image_directory}/${IMAGE}" done elif [ -e "${image_directory}/${MODULE}.module" ] then - for IMAGE in `cat ${image_directory}/${MODULE}.module` + for IMAGE in $(cat ${image_directory}/${MODULE}.module) do - image_string="${image_string} ${image_directory}/${image}" + image_string="${image_string} ${image_directory}/${IMAGE}" done else # ${MODULE}.module does not exist, create a list of images - for FILESYSTEM in squashfs ext2 ext3 xfs dir + for FILESYSTEM in squashfs ext2 ext3 xfs jffs2 dir do for IMAGE in "${image_directory}"/*."${FILESYSTEM}" do @@ -874,8 +940,22 @@ setup_unionfs () done done + if [ -n "${addimage_directory}" ] && [ -d "${addimage_directory}" ] + then + for FILESYSTEM in squashfs ext2 ext3 xfs jffs2 dir + do + for IMAGE in "${addimage_directory}"/*."${FILESYSTEM}" + do + if [ -e "${IMAGE}" ] + then + image_string="${image_string} ${IMAGE}" + fi + done + done + fi + # Now sort the list - image_string="`echo ${image_string} | sed -e 's/ /\n/g' | sort `" + image_string="$(echo ${image_string} | sed -e 's/ /\n/g' | sort )" fi [ -n "${MODULETORAMFILE}" ] && image_string="${image_directory}/$(basename ${MODULETORAMFILE})" @@ -893,7 +973,7 @@ setup_unionfs () rofslist="${image} ${rofslist}" elif [ -f "${image}" ] then - backdev=$(get_backing_device "$image") + backdev=$(get_backing_device "${image}") fstype=$(get_fstype "${backdev}") if [ "${fstype}" = "unknown" ] @@ -902,16 +982,14 @@ setup_unionfs () fi mkdir -p "${croot}/${imagename}" - echo "debug: Can not mount backdev $backdev (image = $image) on croot/imagename ${croot}/${imagename}" - mount -t "${fstype}" -o ro "${backdev}" "${croot}/${imagename}" || panic "Can not mount $backdev ($image) on ${croot}/${imagename}" && rofsstring="${croot}/${imagename}=${roopt}:${rofsstring}" && rofslist="${croot}/${imagename} ${rofslist}" + echo "debug: Can not mount backdev ${backdev} (image = ${image}) on croot/imagename ${croot}/${imagename}" + 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 rofsstring=${rofsstring%:} mkdir -p /cow - cowdevice="tmpfs" - cow_fstype="tmpfs" # Looking for "${root_persistence}" device or file if [ -n "${PERSISTENT}" ] @@ -923,13 +1001,78 @@ setup_unionfs () cowdevice=${cowprobe} cow_fstype=$(get_fstype "${cowprobe}") else - [ "$quiet" != "y" ] && log_warning_msg "Unable to find the persistent medium" + [ "${quiet}" != "y" ] && log_warning_msg "Unable to find the persistent medium" + cowdevice="tmpfs" + cow_fstype="tmpfs" + fi + elif [ -n "${NFS_COW}" ] + then + # check if there are any nfs options + if echo ${NFS_COW}|grep -q ',' + then + nfs_cow_opts="-o nolock,$(echo ${NFS_COW}|cut -d, -f2-)" + nfs_cow=$(echo ${NFS_COW}|cut -d, -f1) + else + nfs_cow_opts="-o nolock" + nfs_cow=${NFS_COW} fi + mac="$(get_mac)" + if [ -n "${mac}" ] + then + cowdevice=$(echo ${nfs_cow}|sed "s/client_mac_address/${mac}/") + cow_fstype="nfs" + else + panic "unable to determine mac address" + fi + else + cowdevice="tmpfs" + cow_fstype="tmpfs" fi - mount ${cowdevice} -t ${cow_fstype} -o rw /cow || panic "Can not mount $cowdevice on /cow" + if [ "${cow_fstype}" = "nfs" ] + then + [ "${quiet}" != "y" ] && log_begin_msg \ + "Trying nfsmount ${nfs_cow_opts} ${cowdevice} /cow" + nfsmount ${nfs_cow_opts} ${cowdevice} /cow || \ + panic "Can not mount ${cowdevice} on /cow" + else + mount ${cowdevice} -t ${cow_fstype} -o rw,noatime /cow || \ + panic "Can not mount ${cowdevice} on /cow" + fi + + rofscount=$(echo ${rofslist} |wc -w) + + 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" + + cow_dirs='/var/tmp /var/lock /var/run /var/log /var/spool + /home /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 -t ${UNIONTYPE} -o noatime,dirs=/cow=rw:${rofsstring} \ + ${UNIONTYPE} "${rootmnt}" || panic "mount ${UNIONTYPE} on \ + ${rootmnt} failed with option noatime,dirs=/cow=rw:${rofsstring}" + fi - mount -t ${UNIONTYPE} -o dirs=/cow=rw:$rofsstring ${UNIONTYPE} "$rootmnt" || panic "${UNIONTYPE} mount failed" + # tmpfs file systems + mkdir -p "${rootmnt}/live" + mount -t tmpfs tmpfs ${rootmnt}/live # Adding other custom mounts if [ -n "${PERSISTENT}" ] @@ -940,10 +1083,10 @@ setup_unionfs () if [ -b "${homecow}" ] then - mount -t $(get_fstype "${homecow}") -o rw "${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" + [ "${quiet}" != "y" ] && log_warning_msg "Unable to find the persistent home medium" fi # Look for other snapshots to copy in @@ -971,13 +1114,14 @@ setup_unionfs () # shows cow fs on /cow for use by live-snapshot mkdir -p "${rootmnt}/live/cow" - mount -o bind /cow "${rootmnt}/live/cow" + mount -o move /cow "${rootmnt}/live/cow" } check_dev () { sysdev="${1}" devname="${2}" + skip_uuid_check="${3}" if [ -z "${devname}" ] then @@ -994,14 +1138,15 @@ check_dev () if is_supported_fs ${fstype} then - mount -t ${fstype} -o ro "${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 + echo ${mountpoint} return 0 else - umount $mountpoint + umount ${mountpoint} fi fi @@ -1020,7 +1165,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 @@ -1036,7 +1181,7 @@ find_livefs () fi # or do the scan of block devices - for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram) + for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v 'dm-') do devname=$(sys2dev "${sysblock}") fstype=$(get_fstype "${devname}") @@ -1058,7 +1203,8 @@ find_livefs () done elif [ "${fstype}" = "squashfs" -o \ "${fstype}" = "ext2" -o \ - "${fstype}" = "ext3" ] + "${fstype}" = "ext3" -o \ + "${fstype}" = "jffs2" ] then # This is an ugly hack situation, the block device has # an image directly on it. It's hopefully @@ -1072,14 +1218,6 @@ find_livefs () return 1 } -pulsate () -{ - if [ -x /sbin/usplash_write ] - then - /sbin/usplash_write "PULSATE" - fi -} - set_usplash_timeout () { if [ -x /sbin/usplash_write ] @@ -1090,6 +1228,11 @@ set_usplash_timeout () mountroot () { + + if [ -x /scripts/local-top/cryptroot ]; then + /scripts/local-top/cryptroot + fi + exec 6>&1 exec 7>&2 exec > live.log @@ -1098,10 +1241,9 @@ mountroot () Arguments set_usplash_timeout - [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/live-premount" - pulsate + [ "${quiet}" != "y" ] && log_begin_msg "Running /scripts/live-premount" run_scripts /scripts/live-premount - [ "$quiet" != "y" ] && log_end_msg + [ "${quiet}" != "y" ] && log_end_msg # Needed here too because some things (*cough* udev *cough*) # changes the timeout @@ -1117,18 +1259,24 @@ mountroot () panic "Unable to find a live file system on the network" fi else - # Scan local devices for the image - for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - do - livefs_root=$(find_livefs $i) + if [ -n "${PLAIN_ROOT}" ] && [ -n "${ROOT}" ] + then + # Do a local boot from hd + livefs_root=${ROOT} + else + # Scan local devices for the image + for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 + do + livefs_root=$(find_livefs ${i}) - if [ -n "${livefs_root}" ] - then - break - fi + if [ -n "${livefs_root}" ] + then + break + fi - sleep 1 - done + sleep 1 + done + fi fi if [ -z "${livefs_root}" ] @@ -1153,19 +1301,20 @@ mountroot () if [ -n "${MODULETORAMFILE}" ] then - setup_unionfs "${livefs_root}" "$rootmnt" + setup_unionfs "${livefs_root}" "${rootmnt}" else - mount_images_in_directory "${livefs_root}" "${rootmnt}" + mac="$(get_mac)" + mac="$(echo ${mac} | sed 's/-//g')" + mount_images_in_directory "${livefs_root}" "${rootmnt}" "${mac}" fi log_end_msg maybe_break live-bottom - [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/live-bottom" + [ "${quiet}" != "y" ] && log_begin_msg "Running /scripts/live-bottom" - pulsate run_scripts /scripts/live-bottom - [ "$quiet" != "y" ] && log_end_msg + [ "${quiet}" != "y" ] && log_end_msg exec 1>&6 6>&- exec 2>&7 7>&-