fi
# XXX: If CONFIG_AUFS_ROBR is added to the Debian kernel we can
- # ignore the loop below and set rofs_dest_backing=$dest
- local rofs_dest_backing=""
+ # ignore the loop below and set rootfs_dest_backing=$dest
+ local rootfs_dest_backing=""
if [ -n "${opt_link}"]
then
- for d in /live/rofs/*
+ for d in /live/rootfs/*
do
if [ -n "${rootmnt}" ]
then
- rofs_dest_backing="${d}/$(echo ${dest} | sed -e "s|${rootmnt}||")"
+ rootfs_dest_backing="${d}/$(echo ${dest} | sed -e "s|${rootmnt}||")"
else
- rofs_dest_backing="${d}/${dest}"
+ rootfs_dest_backing="${d}/${dest}"
fi
- if [ -d "${rofs_dest_backing}" ]
+ if [ -d "${rootfs_dest_backing}" ]
then
break
else
- rofs_dest_backing=""
+ rootfs_dest_backing=""
fi
done
fi
mkdir -p ${cow_dir}
chown_ref "${source}" "${cow_dir}"
chmod_ref "${source}" "${cow_dir}"
- do_union ${links_source} ${cow_dir} ${source} ${rofs_dest_backing}
+ do_union ${links_source} ${cow_dir} ${source} ${rootfs_dest_backing}
link_files ${links_source} ${dest} ${rootmnt}
elif [ -n "${opt_union}" ] && [ -z "${PERSISTENCE_READONLY}" ]
then
- do_union ${dest} ${source} ${rofs_dest_backing}
+ do_union ${dest} ${source} ${rootfs_dest_backing}
elif [ -n "${opt_bind}" ] && [ -z "${PERSISTENCE_READONLY}" ]
then
mount --bind "${source}" "${dest}"
elif [ -n "${opt_bind}" -o -n "${opt_union}" ] && [ -n "${PERSISTENCE_READONLY}" ]
then
# bind-mount and union mount are handled the same
- # in read-only mode, but note that rofs_dest_backing
+ # in read-only mode, but note that rootfs_dest_backing
# is non-empty (and necessary) only for unions
if [ -n "${rootmnt}" ]
then
mkdir -p ${cow_dir}
chown_ref "${source}" "${cow_dir}"
chmod_ref "${source}" "${cow_dir}"
- do_union ${dest} ${cow_dir} ${source} ${rofs_dest_backing}
+ do_union ${dest} ${cow_dir} ${source} ${rootfs_dest_backing}
fi
PERSISTENCE_IS_ON="1"
croot="/"
# Let's just mount the read-only file systems first
- rofslist=""
+ rootfslist=""
if [ -z "${PLAIN_ROOT}" ]
then
if [ -d "${image}" ]
then
# it is a plain directory: do nothing
- rofslist="${image} ${rofslist}"
+ rootfslist="${image} ${rootfslist}"
elif [ -f "${image}" ]
then
if losetup --help 2>&1 | grep -q -- "-r\b"
case "${UNIONTYPE}" in
unionmount)
mpoint="${rootmnt}"
- rofslist="${rootmnt} ${rofslist}"
+ rootfslist="${rootmnt} ${rootfslist}"
;;
*)
mpoint="${croot}/${imagename}"
- rofslist="${mpoint} ${rofslist}"
+ rootfslist="${mpoint} ${rootfslist}"
;;
esac
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" && \
- rofslist="${croot}/filesystem ${rofslist}"
+ rootfslist="${croot}/filesystem ${rootfslist}"
# probably broken:
mount -o bind ${croot}/filesystem $mountpoint
log_end_msg
fi
fi
- rofscount=$(echo ${rofslist} |wc -w)
+ rootfscount=$(echo ${rootfslist} |wc -w)
- rofs=${rofslist%% }
+ rootfs=${rootfslist%% }
if [ -n "${EXPOSED_ROOT}" ]
then
- if [ ${rofscount} -ne 1 ]
+ if [ ${rootfscount} -ne 1 ]
then
- panic "only one RO file system supported with exposedroot: ${rofslist}"
+ panic "only one RO file system supported with exposedroot: ${rootfslist}"
fi
- mount --bind ${rofs} ${rootmnt} || \
- panic "bind mount of ${rofs} failed"
+ mount --bind ${rootfs} ${rootmnt} || \
+ panic "bind mount of ${rootfs} failed"
if [ -z "${SKIP_UNION_MOUNTS}" ]
then
mount_full $unionmountopts "${unionmountpoint}"
else
cow_dir="/live/overlay${dir}"
- rofs_dir="${rofs}${dir}"
+ rootfs_dir="${rootfs}${dir}"
mkdir -p ${cow_dir}
if [ -n "${PERSISTENCE_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ]
then
- do_union ${unionmountpoint} ${cow_dir} ${root_backing} ${rofs_dir}
+ do_union ${unionmountpoint} ${cow_dir} ${root_backing} ${rootfs_dir}
else
- do_union ${unionmountpoint} ${cow_dir} ${rofs_dir}
+ do_union ${unionmountpoint} ${cow_dir} ${rootfs_dir}
fi
fi || panic "mount ${UNIONTYPE} on ${unionmountpoint} failed with option ${unionmountopts}"
done
chmod 1777 "${rootmnt}"/tmp
fi
- live_rofs_list=""
- for d in ${rofslist}
+ live_rootfs_list=""
+ for d in ${rootfslist}
do
- live_rofs="/live/rofs/${d##*/}"
- live_rofs_list="${live_rofs_list} ${live_rofs}"
- mkdir -p "${live_rofs}"
+ live_rootfs="/live/rootfs/${d##*/}"
+ live_rootfs_list="${live_rootfs_list} ${live_rootfs}"
+ mkdir -p "${live_rootfs}"
case d in
*.dir)
- # do nothing # mount -o bind "${d}" "${live_rofs}"
+ # do nothing # mount -o bind "${d}" "${live_rootfs}"
;;
*)
case "${UNIONTYPE}" in
unionfs-fuse)
- mount -o bind "${d}" "${live_rofs}"
+ mount -o bind "${d}" "${live_rootfs}"
;;
*)
- mount -o move "${d}" "${live_rofs}"
+ mount -o move "${d}" "${live_rootfs}"
;;
esac
;;
fi
# move all mountpoints to root filesystem
- for _DIRECTORY in rofs persistence
+ for _DIRECTORY in rootfs persistence
do
if [ -d "/live/${_DIRECTORY}" ]
then