alt_mountpoint="/media"
LIVE_MEDIA_PATH="live"
-USERNAME="user"
-USERFULLNAME="Live user"
HOSTNAME="host"
mkdir -p "${mountpoint}"
return 1
fi
- if [ -z ${PERSISTENT_READONLY} ]
+ if [ -z ${PERSISTENCE_READONLY} ]
then
echo "export ${snap_type}SNAP=${snap_relpath}:${snapdev}:${snapfile}" >> snapshot.conf # for resync on reboot/halt
fi
log_end_msg
fi
- mkdir -p /cow
+ mkdir -p /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}" ]
done
fi
- case "${PERSISTENT_MEDIA}" in
+ case "${PERSISTENCE_MEDIA}" in
removable)
whitelistdev="$(removable_dev)"
;;
;;
esac
- if echo ${PERSISTENT_METHOD} | grep -qe "\<overlay\>"
+ if echo ${PERSISTENCE_METHOD} | grep -qe "\<overlay\>"
then
overlays="${root_overlay_label} ${old_root_overlay_label} ${old_home_overlay_label} ${custom_overlay_label}"
fi
- if echo ${PERSISTENT_METHOD} | grep -qe "\<snapshot\>"
+ if echo ${PERSISTENCE_METHOD} | grep -qe "\<snapshot\>"
then
snapshots="${root_snapshot_label} ${home_snapshot_label}"
fi
local home_snapshot_label=""
local root_overlay_label=""
local overlay_devices=""
- for media in $(find_persistent_media "${overlays}" "${snapshots}" "${whitelistdev}")
+ for media in $(find_persistence_media "${overlays}" "${snapshots}" "${whitelistdev}")
do
media="$(echo ${media} | tr ":" " ")"
case ${media} in
cowdevice=${root_overlay_device}
cow_fstype=$(get_fstype "${root_overlay_device}")
- if [ -z "${PERSISTENT_READONLY}" ]
+ if [ -z "${PERSISTENCE_READONLY}" ]
then
cow_mountopt="rw,noatime"
else
cow_mountopt="ro,noatime"
fi
- if [ "${FORCEPERSISTENTFSCK}" = "Yes" ]
+ if [ "${FORCEPERSISTENCEFSCK}" = "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 ','
nfs_cow=${NFS_COW}
fi
- if [ -n "${PERSISTENT_READONLY}" ]
+ if [ -n "${PERSISTENCE_READONLY}" ]
then
nfs_cow_opts="${nfs_cow_opts},nocto,ro"
fi
if [ "${UNIONTYPE}" != "unionmount" ]
then
- if [ -n "${PERSISTENT_READONLY}" ]
+ if [ -n "${PERSISTENCE_READONLY}" ]
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 "/overlay"
+ root_backing="${rootmnt}/live/persistence/$(basename ${cowdevice})-root"
mkdir -p ${root_backing}
else
- root_backing="/cow"
+ root_backing="/overlay"
fi
if [ "${cow_fstype}" = "nfs" ]
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="/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}
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}
done
fi
- # Adding custom persistent
- if [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ]
+ # Adding custom persistence
+ if [ -n "${PERSISTENCE}" ] && [ -z "${NOPERSISTENCE}" ]
then
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 ${custom_mounts} ${overlay_devices}
- [ -n "${DEBUG}" ] && cp ${custom_mounts} "${rootmnt}/live/persistent"
+ [ -n "${DEBUG}" ] && cp ${custom_mounts} "${rootmnt}/live/persistence"
# Now we do the actual mounting (and symlinking)
- do_custom_mounts ${custom_mounts}
+ 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"
+ # shows cow fs on /overlay for use by live-snapshot
+ mkdir -p "${rootmnt}/live/overlay"
+ mount -o move /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 ()
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
# 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
+ fi
+ fi
+
# copy snapshot configuration if exists
if [ -f snapshot.conf ]
then
projects / live-boot-grml.git / blobdiff