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
console=*)
DEFCONSOLE="${ARGUMENT#*=}"
- export DEFCONFSOLE
+ export DEFCONSOLE
;;
debug)
export FETCH
;;
+ hook=*)
+ HOOK="${ARGUMENT#hook=}"
+ export HOOK
+ ;;
+
hostname=*)
HOSTNAME="${ARGUMENT#hostname=}"
LIVECONF="changed"
export USERFULLNAME LIVECONF
;;
+ ignore_uuid)
+ IGNORE_UUID="Yes"
+ export IGNORE_UUID
+ ;;
+
ip=*)
STATICIP="${ARGUMENT#ip=}"
export NFSOPTS
;;
+ nfscow=*)
+ NFS_COW="${ARGUMENT#nfscow=}"
+ export NFS_COW
+ ;;
+
noaccessibility)
NOACCESSIBILITY="Yes"
export NOACCESSIBILITY
export SHOWMOUNTS
;;
+ textonly)
+ TEXTONLY="Yes"
+ export TEXTONLY
+ ;;
+
timezone=*)
TIMEZONE="${ARGUMENT#timezone=}"
export TIMEZONE
export TORAM MODULETORAM
;;
+ exposedroot)
+ EXPOSED_ROOT="Yes"
+ export EXPOSED_ROOT
+ ;;
+
union=*)
UNIONTYPE="${ARGUMENT#union=}"
export UNIONTYPE
export XDEBCONF
;;
+ xdriver=*)
+ XDRIVER="${ARGUMENT#xdriver=}"
+ export XDRIVER
+ ;;
+
xvideomode=*)
XVIDEOMODE="${ARGUMENT#xvideomode=}"
export XVIDEOMODE
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}" ]
then
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)
+ *.squashfs|*.ext2|*.ext3|*.jffs2)
echo $(setup_loop "${1}" "loop" "/sys/block/loop*" '0' "${LIVE_MEDIA_ENCRYPTION}")
;;
{
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}/*.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
fstype="${1}"
case ${fstype} in
- vfat|iso9660|udf|ext2|ext3|ntfs)
+ vfat|iso9660|udf|ext2|ext3|ntfs|jffs2)
return 0
;;
esac
{
rc=1
- modprobe "${MP_QUIET}" af_packet # For DHCP
+ modprobe -q af_packet # For DHCP
udevtrigger
udevsettle
{
rc=1
- modprobe "${MP_QUIET}" nfs
+ modprobe -q nfs
if [ -z "${NFSOPTS}" ]
then
fi
[ "${quiet}" != "y" ] && log_begin_msg "Trying mount.cifs ${NFSROOT} ${mountpoint} ${CIFSOPTS}"
- modprobe "${MP_QUIET}" cifs
+ modprobe -q cifs
if mount.cifs "${NFSROOT}" "${mountpoint}" "${CIFSOPTS}"
then
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
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
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}"
{
image_directory="${1}"
rootmnt="${2}"
-
- modprobe "${MP_QUIET}" -b ${UNIONTYPE}
+ 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,
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
then
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)
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
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 )"
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}"
+ 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}" ]
cow_fstype=$(get_fstype "${cowprobe}")
else
[ "${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
- mount -t ${UNIONTYPE} -o dirs=/cow=rw:${rofsstring} ${UNIONTYPE} "${rootmnt}" || panic "${UNIONTYPE} mount failed"
+ 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
+
+ # tmpfs file systems
+ mkdir -p "${rootmnt}/live"
+ mount -t tmpfs tmpfs ${rootmnt}/live
# Adding other custom mounts
if [ -n "${PERSISTENT}" ]
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"
{
sysdev="${1}"
devname="${2}"
+ skip_uuid_check="${3}"
if [ -z "${devname}" ]
then
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}
return 0
# 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
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}")
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
return 1
}
-pulsate ()
-{
- if [ -x /sbin/usplash_write ]
- then
- /sbin/usplash_write "PULSATE"
- fi
-}
-
set_usplash_timeout ()
{
if [ -x /sbin/usplash_write ]
mountroot ()
{
+
+ if [ -x /scripts/local-top/cryptroot ]; then
+ /scripts/local-top/cryptroot
+ fi
+
exec 6>&1
exec 7>&2
exec > live.log
set_usplash_timeout
[ "${quiet}" != "y" ] && log_begin_msg "Running /scripts/live-premount"
- pulsate
run_scripts /scripts/live-premount
[ "${quiet}" != "y" ] && log_end_msg
then
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"
- pulsate
run_scripts /scripts/live-bottom
[ "${quiet}" != "y" ] && log_end_msg
projects / live-boot-grml.git / blobdiff