export FETCH
;;
+ forcepersistentfsck)
+ FORCEPERSISTENTFSCK="Yes"
+ export FORCEPERSISTENTFSCK
+ ;;
+
hook=*)
HOOK="${ARGUMENT#hook=}"
export HOOK
export HOSTNAME LIVECONF
;;
+ isofrom=*|fromiso=*)
+ FROMISO="${ARGUMENT#*=}"
+ export FROMISO
+ ;;
+
username=*)
USERNAME="${ARGUMENT#username=}"
LIVECONF="changed"
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
{
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-)"
then
return 0
elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'
if [ -z "${MODULETORAM}" ]
then
- size=$(fs_size "" ${copyfrom} "used")
+ size=$(fs_size "" ${copyfrom}/${LIVE_MEDIA_PATH} "used")
else
MODULETORAMFILE="${copyfrom}/${LIVE_MEDIA_PATH}/${MODULETORAM}"
# 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" ]
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}
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"
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}")
log_end_msg
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 "$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}"