Adding upstream version 1.173.3.
[live-boot-grml.git] / scripts / live
index bf90781..d162f75 100755 (executable)
@@ -49,6 +49,35 @@ Arguments ()
        for ARGUMENT in $(cat /proc/cmdline)
        do
                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
+                               ;;
+
                        access=*)
                                ACCESS="${ARGUMENT#access=}"
                                export ACCESS
@@ -66,11 +95,21 @@ Arguments ()
                                set -x
                                ;;
 
+                       ethdevice=*)
+                               DEVICE="${ARGUMENT#ethdevice=}"
+                               export DEVICE
+                               ;;
+
                        fetch=*)
                                 FETCH="${ARGUMENT#fetch=}"
                                 export FETCH
                                 ;;
 
+                       forcepersistentfsck)
+                               FORCEPERSISTENTFSCK="Yes"
+                               export FORCEPERSISTENTFSCK
+                               ;;
+
                        hook=*)
                                HOOK="${ARGUMENT#hook=}"
                                export HOOK
@@ -92,6 +131,11 @@ Arguments ()
                                export HOSTNAME LIVECONF
                                ;;
 
+                       isofrom=*|fromiso=*)
+                               FROMISO="${ARGUMENT#*=}"
+                               export FROMISO
+                               ;;
+
                        username=*)
                                USERNAME="${ARGUMENT#username=}"
                                LIVECONF="changed"
@@ -345,11 +389,23 @@ Arguments ()
                                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=*)
                                LOCATION="${ARGUMENT#*=}"
                                export LOCATION
@@ -368,9 +424,9 @@ Arguments ()
                                mount -o bind /dev /root/dev
 
                                mkdir -p /root/var/run/network
-                               chroot /root dhclient eth0
+                               [ "${NETBOOT}" ] || chroot /root dhclient eth0
                                chroot /root wget -P /tmp "${location}"
-                               chroot /root ifconfig eth0 down
+                               [ "${NETBOOT}" ] || chroot /root ifconfig eth0 down
 
                                umount /root/sys
                                umount /root/proc
@@ -391,6 +447,11 @@ Arguments ()
                                export SHOWMOUNTS
                                ;;
 
+                       silent)
+                               SILENT="Yes"
+                               export SILENT
+                               ;;
+
                        textonly)
                                TEXTONLY="Yes"
                                export TEXTONLY
@@ -502,7 +563,7 @@ is_live_path ()
 
        if [ -d "${DIRECTORY}"/"${LIVE_MEDIA_PATH}" ]
        then
-               for FILESYSTEM in squashfs ext2 ext3 xfs dir jffs2
+               for FILESYSTEM in squashfs ext2 ext3 ext4 xfs dir jffs2
                do
                        if [ "$(echo ${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM})" != "${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM}" ]
                        then
@@ -542,7 +603,7 @@ matches_uuid ()
 get_backing_device ()
 {
        case "${1}" in
-               *.squashfs|*.ext2|*.ext3|*.jffs2)
+               *.squashfs|*.ext2|*.ext3|*.ext4|*.jffs2)
                        echo $(setup_loop "${1}" "loop" "/sys/block/loop*" '0' "${LIVE_MEDIA_ENCRYPTION}" "${2}")
                        ;;
 
@@ -579,6 +640,7 @@ mount_images_in_directory ()
        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}/*.ext4" ||
                match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.jffs2" ||
                match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.dir"
        then
@@ -593,7 +655,7 @@ is_nice_device ()
 {
        sysfs_path="${1#/sys}"
 
-       if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-[^-]*-(ide|scsi|usb))"
+       if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-|platform-mmc)"
        then
                return 0
        elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'
@@ -612,7 +674,7 @@ copy_live_to ()
 
        if [ -z "${MODULETORAM}" ]
        then
-               size=$(fs_size "" ${copyfrom} "used")
+               size=$(fs_size "" ${copyfrom}/${LIVE_MEDIA_PATH} "used")
        else
                MODULETORAMFILE="${copyfrom}/${LIVE_MEDIA_PATH}/${MODULETORAM}"
 
@@ -655,7 +717,7 @@ copy_live_to ()
 
        # begin copying (or uncompressing)
        mkdir "${copyto}"
-       echo "mount -t ${fstype} ${mount_options} ${dev} ${copyto}"
+       log_begin_msg "mount -t ${fstype} ${mount_options} ${dev} ${copyto}"
        mount -t "${fstype}" ${mount_options} "${dev}" "${copyto}"
 
        if [ "${extension}" = "tgz" ]
@@ -668,9 +730,22 @@ copy_live_to ()
        else
                if [ -n "${MODULETORAMFILE}" ]
                then
-                       cp ${MODULETORAMFILE} ${copyto} # copy only the filesystem module
+                       if [ -x /bin/rsync ]
+                       then
+                               echo " * Copying $MODULETORAMFILE to RAM" 1>/dev/console
+                               rsync -a --progress ${MODULETORAMFILE} ${copyto} 1>/dev/console # copy only the filesystem module
+                       else
+                               cp ${MODULETORAMFILE} ${copyto} # copy only the filesystem module
+                       fi
                else
-                       cp -a ${copyfrom}/* ${copyto}   # "cp -a" from busybox also copies hidden files
+                       if [ -x /bin/rsync ]
+                       then
+                               echo " * Copying whole medium to RAM" 1>/dev/console
+                               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
+                       fi
                fi
 
                umount ${copyfrom}
@@ -767,9 +842,11 @@ do_httpmount ()
                                        then
                                                case "$url" in
                                                        tftp*)
-                                                               ip="$(dirname $url | sed -e 's|tftp://||g')"
-                                                               log_begin_msg "Trying tftp -g -b 10240 -r $(basename ${url})  -l ${dest}/$(basename ${url}) $ip"
-                                                               tftp -g -b 10240 -r $(basename ${url})  -l ${dest}/$(basename ${url}) $ip
+                                                               ip="$(dirname $url | sed -e 's|tftp://||g' -e 's|/.*$||g')"
+                                                               rfile="$(echo $url | sed -e "s|tftp://$ip||g")"
+                                                               lfile="$(basename $url)"
+                                                               log_begin_msg "Trying tftp -g -b 10240 -r $rfile -l ${dest}/$lfile $ip"
+                                                               tftp -g -b 10240 -r $rfile -l ${dest}/$lfile $ip
                                                        ;;
 
                                                        *)
@@ -919,7 +996,7 @@ find_snap ()
        if [ "${PERSISTENT}" != "nofiles" ]
        then
                # search for image files
-               snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2 ${snap_label}.ext3 ${snap_label}.jffs2")
+               snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2 ${snap_label}.ext3 ${snap_label}.ext4 ${snap_label}.jffs2")
        fi
 
        if [ -z "${snapdata}" ]
@@ -938,7 +1015,7 @@ try_snap ()
        snap_mount="${2}"
        snap_type="${3}"
 
-       if [ ! -z "${snapdata}" ]
+       if [ -n "${snapdata}" ] && [ ! -b "${snapdata}" ]
        then
                log_success_msg "found snapshot: ${snapdata}"
                snapdev="$(echo ${snapdata} | cut -f1 -d ' ')"
@@ -951,9 +1028,9 @@ try_snap ()
                        break
                fi
 
-               if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\|ext3\|jffs2\)'
+               if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\|ext3\|ext4\|jffs2\)'
                then
-                       # squashfs, jffs2 or ext2/ext3 snapshot
+                       # squashfs, jffs2 or ext2/ext3/ext4 snapshot
                        dev=$(get_backing_device "${snapback}/${snapfile}")
 
                        do_snap_copy "${dev}" "${snap_mount}" "${snap_type}"
@@ -977,12 +1054,11 @@ try_snap ()
                        log_warning_msg "Impossible to include the ${snapfile} Snapshot file"
                fi
 
-
        elif [ -b "${snapdata}" ]
        then
                # Try to find if it could be a snapshot partition
                dev="${snapdata}"
-               log_success_msg "found snapshot device on ${dev}"
+               log_success_msg "found snapshot ${snap_type} device on ${dev}"
                if echo "${dev}" | grep -qs loop
                then
                        # strange things happens, user confused?
@@ -1030,50 +1106,34 @@ 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].*//')
 
-       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" ]
+       if [ "${UNIONTYPE}" = "aufs" ]
        then
-               roopt="rr"
+               roopt="rr,noxino"
        else
                roopt="ro"
        fi
 
-       # Read image names from ${MODULE}.module if it exists
-       if [ -e "${image_directory}/filesystem.${MODULE}.module" ]
+       if [ -z "${PLAIN_ROOT}" ]
        then
-               for IMAGE in $(cat ${image_directory}/filesystem.${MODULE}.module)
-               do
-                       image_string="${image_string} ${image_directory}/${IMAGE}"
-               done
-       elif [ -e "${image_directory}/${MODULE}.module" ]
-       then
-               for IMAGE in $(cat ${image_directory}/${MODULE}.module)
-               do
-                       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 jffs2 dir
-               do
-                       for IMAGE in "${image_directory}"/*."${FILESYSTEM}"
+               # 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)
                        do
-                               if [ -e "${IMAGE}" ]
-                               then
-                                       image_string="${image_string} ${IMAGE}"
-                               fi
+                               image_string="${image_string} ${image_directory}/${IMAGE}"
                        done
-               done
-
-               if [ -n "${addimage_directory}" ] && [ -d "${addimage_directory}" ]
+               elif [ -e "${image_directory}/${MODULE}.module" ]
                then
-                       for FILESYSTEM in squashfs ext2 ext3 xfs jffs2 dir
+                       for IMAGE in $(cat ${image_directory}/${MODULE}.module)
                        do
-                               for IMAGE in "${addimage_directory}"/*."${FILESYSTEM}"
+                               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 ext4 xfs jffs2 dir
+                       do
+                               for IMAGE in "${image_directory}"/*."${FILESYSTEM}"
                                do
                                        if [ -e "${IMAGE}" ]
                                        then
@@ -1081,58 +1141,80 @@ setup_unionfs ()
                                        fi
                                done
                        done
-               fi
 
-               # Now sort the list
-               image_string="$(echo ${image_string} | sed -e 's/ /\n/g' | sort )"
-       fi
+                       if [ -n "${addimage_directory}" ] && [ -d "${addimage_directory}" ]
+                       then
+                               for FILESYSTEM in squashfs ext2 ext3 ext4 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 )"
+               fi
 
        [ -n "${MODULETORAMFILE}" ] && image_string="${image_directory}/$(basename ${MODULETORAMFILE})"
 
-       mkdir -p "${croot}"
+               mkdir -p "${croot}"
 
-       for image in ${image_string}
-       do
-               imagename=$(basename "${image}")
+               for image in ${image_string}
+               do
+                       imagename=$(basename "${image}")
 
-               export image devname
-               maybe_break live-realpremount
-               log_begin_msg "Running /scripts/live-realpremount"
-               run_scripts /scripts/live-realpremount
-               log_end_msg
+                       export image devname
+                       maybe_break live-realpremount
+                       log_begin_msg "Running /scripts/live-realpremount"
+                       run_scripts /scripts/live-realpremount
+                       log_end_msg
 
-               if [ -d "${image}" ]
-               then
-                       # it is a plain directory: do nothing
-                       rofsstring="${image}=${roopt}:${rofsstring}"
-                       rofslist="${image} ${rofslist}"
-               elif [ -f "${image}" ]
-               then
-                       if losetup --help 2>&1 | grep -q -- "-r\b"
+                       if [ -d "${image}" ]
                        then
-                               backdev=$(get_backing_device "${image}" "-r")
-                       else
-                               backdev=$(get_backing_device "${image}")
-                       fi
-                       fstype=$(get_fstype "${backdev}")
-
-                       if [ "${fstype}" = "unknown" ]
+                               # it is a plain directory: do nothing
+                               rofsstring="${image}=${roopt}:${rofsstring}"
+                               rofslist="${image} ${rofslist}"
+                       elif [ -f "${image}" ]
                        then
-                               panic "Unknown file system type on ${backdev} (${image})"
-                       fi
+                               if losetup --help 2>&1 | grep -q -- "-r\b"
+                               then
+                                       backdev=$(get_backing_device "${image}" "-r")
+                               else
+                                       backdev=$(get_backing_device "${image}")
+                               fi
+                               fstype=$(get_fstype "${backdev}")
 
-                       if [ -z "${fstype}" ]
-                       then
-                               fstype="${imagename##*.}"
-                               log_warning_msg "Unknown file system type on ${backdev} (${image}), assuming ${fstype}."
-                       fi
+                               if [ "${fstype}" = "unknown" ]
+                               then
+                                       panic "Unknown file system type on ${backdev} (${image})"
+                               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}"
-                       log_end_msg
-               fi
-       done
+                               if [ -z "${fstype}" ]
+                               then
+                                       fstype="${imagename##*.}"
+                                       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}"
+                               log_end_msg
+                       fi
+               done
+       else
+               # 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}"
+               # probably broken:
+               mount -o bind ${croot}/filesystem $mountpoint
+               log_end_msg
+       fi
 
        rofsstring=${rofsstring%:}
 
@@ -1141,37 +1223,40 @@ setup_unionfs ()
        # Looking for "${root_persistence}" device or file
        if [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ]
        then
-               # Load USB modules
-               num_block=$(ls -l /sys/block | wc -l)
-               for module in sd_mod uhci-hcd ehci-hcd ohci-hcd usb-storage
-               do
-                       modprobe -q -b ${module}
-               done
-
-               if [ -x /sbin/udevadm ]
+               if [ -z "${QUICKUSBMODULES}" ]
                then
-                       # lenny
-                       udevadm trigger
-                       udevadm settle
-               else
-                       # etch
-                       udevtrigger
-                       udevsettle
-               fi
-
-               # For some reason, udevsettle does not block in this scenario,
-               # so we sleep for a little while.
-               #
-               # See https://bugs.launchpad.net/ubuntu/+source/casper/+bug/84591
-               for timeout in 5 4 3 2 1
-               do
-                       sleep 1
+                       # Load USB modules
+                       num_block=$(ls -l /sys/block | wc -l)
+                       for module in sd_mod uhci-hcd ehci-hcd ohci-hcd usb-storage
+                       do
+                               modprobe -q -b ${module}
+                       done
 
-                       if [ $(ls -l /sys/block | wc -l) -gt ${num_block} ]
+                       if [ -x /sbin/udevadm ]
                        then
-                               break
+                               # lenny
+                               udevadm trigger
+                               udevadm settle
+                       else
+                               # etch
+                               udevtrigger
+                               udevsettle
                        fi
-               done
+
+                       # For some reason, udevsettle does not block in this scenario,
+                       # so we sleep for a little while.
+                       #
+                       # See https://bugs.launchpad.net/ubuntu/+source/casper/+bug/84591
+                       for timeout in 5 4 3 2 1
+                       do
+                               sleep 1
+
+                               if [ $(ls -l /sys/block | wc -l) -gt ${num_block} ]
+                               then
+                                       break
+                               fi
+                       done
+               fi
 
                # search for label and files (this could be hugely optimized)
                cowprobe=$(find_cow_device "${root_persistence}")
@@ -1195,7 +1280,7 @@ setup_unionfs ()
                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|jffs2 snapshot types.
+               # ext2|ext3|ext4|jffs2 snapshot types.
                home_snapdata=$(find_snap "${home_snapshot_label}" "${blacklistdev}")
 
                if [ -b "${cowprobe}" ]
@@ -1203,6 +1288,11 @@ setup_unionfs ()
                        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"
@@ -1279,6 +1369,9 @@ setup_unionfs ()
                        ${rootmnt} failed with option noatime,dirs=/cow=rw:${rofsstring}"
        fi
 
+       # Correct the permissions of /:
+       chmod 0755 "${rootmnt}"
+
        # tmpfs file systems
        touch /etc/fstab
        mkdir -p "${rootmnt}/live"
@@ -1333,6 +1426,17 @@ check_dev ()
        devname="${2}"
        skip_uuid_check="${3}"
 
+       # support for fromiso=.../isofrom=....
+       if [ -n "$FROMISO" ]
+       then
+               mkdir /isofrom
+               ISO_DEVICE="$(echo $FROMISO | sed 's|\(/dev/[a-z]*[0-9]*\).*|\1|')"
+               mount "$ISO_DEVICE" /isofrom
+               ISO_NAME="$(echo $FROMISO | sed 's|/dev/[a-z]*[0-9]*/||')"
+               loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
+               devname="${loopdevname}"
+       fi
+
        if [ -z "${devname}" ]
        then
                devname=$(sys2dev "${sysdev}")
@@ -1385,15 +1489,6 @@ find_livefs ()
 {
        timeout="${1}"
 
-       # first look at the one specified in the command line
-       if [ ! -z "${LIVE_MEDIA}" ]
-       then
-               if check_dev "null" "${LIVE_MEDIA}" "skip_uuid_check"
-               then
-                       return 0
-               fi
-       fi
-
        # don't start autodetection before timeout has expired
        if [ -n "${LIVE_MEDIA_TIMEOUT}" ]
        then
@@ -1403,6 +1498,57 @@ find_livefs ()
                fi
        fi
 
+       # 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)")
+                       do
+                               if [ "$(cat ${sysblock}/removable)" = "1" ]
+                               then
+                                       if readlink ${sysblock} | grep -q usb ||
+                                          readlink ${sysblock}/device | grep -q usb # linux < 2.6.29
+                                       then
+                                               for dev in $(subdevices "${sysblock}")
+                                               do
+                                                       if check_dev "${dev}"
+                                                       then
+                                                               return 0
+                                                       fi
+                                               done
+                                       fi
+                               fi
+                       done
+                       return 1
+                       ;;
+
+               removable)
+                       for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
+                       do
+                               if [ "$(cat ${sysblock}/removable)" = "1" ]
+                               then
+                                       for dev in $(subdevices "${sysblock}")
+                                       do
+                                               if check_dev "${dev}"
+                                               then
+                                                       return 0
+                                               fi
+                                       done
+                               fi
+                       done
+                       return 1
+                       ;;
+
+               *)
+                       if [ ! -z "${LIVE_MEDIA}" ]
+                       then
+                               if check_dev "null" "${LIVE_MEDIA}" "skip_uuid_check"
+                               then
+                                       return 0
+                               fi
+                       fi
+                       ;;
+       esac
+
        # or do the scan of block devices
        for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
        do
@@ -1427,6 +1573,7 @@ find_livefs ()
                elif [ "${fstype}" = "squashfs" -o \
                        "${fstype}" = "ext2" -o \
                        "${fstype}" = "ext3" -o \
+                       "${fstype}" = "ext4" -o \
                        "${fstype}" = "jffs2" ]
                then
                        # This is an ugly hack situation, the block device has
@@ -1563,7 +1710,16 @@ mountroot ()
                log_end_msg
        fi
 
-       if [ -n "${MODULETORAMFILE}" ]
+       # 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 "$FROMISO" ] && [ "${TORAM}" ]
+       then
+         losetup -d /dev/loop0
+         grep -q /isofrom /proc/mounts && umount /isofrom
+       fi
+
+       if [ -n "${MODULETORAMFILE}" ] || [ -n "${PLAIN_ROOT}" ]
        then
                setup_unionfs "${livefs_root}" "${rootmnt}"
        else
@@ -1583,5 +1739,5 @@ mountroot ()
        exec 1>&6 6>&-
        exec 2>&7 7>&-
        kill ${tailpid}
-       cp live.log "${rootmnt}/var/log/"
+       [ -w "${rootmnt}/var/log/" ] && cp live.log "${rootmnt}/var/log/" 2>/dev/null
 }