mkdir -p "${mountpoint}"
+# Create /etc/mtab for debug purpose and future syncs
+if [ ! -d /etc ]
+then
+ mkdir /etc/
+fi
+
+if [ ! -f /etc/mtab ]
+then
+ touch /etc/mtab
+fi
+
[ -f /etc/live.conf ] && . /etc/live.conf
export USERNAME USERFULLNAME HOSTNAME
export HOOK
;;
+ ftpfs=*)
+ FTPFS="${ARGUMENT#ftpfs=}"
+ export FTPFS
+ ;;
+
+ httpfs=*)
+ HTTPFS="${ARGUMENT#httpfs=}"
+ export HTTPFS
+ ;;
+
hostname=*)
HOSTNAME="${ARGUMENT#hostname=}"
LIVECONF="changed"
export NOSUDO
;;
- noswap)
- NOSWAP="Yes"
- export NOSWAP
+ swapon)
+ SWAPON="Yes"
+ export SWAPON
;;
noupdatenotifier)
url=*)
location="${ARGUMENT#url=}"
- mount -n -o bind /sys /root/sys
- mount -n -o bind /proc /root/proc
- mount -n -o bind /dev /root/dev
+ mount -o bind /sys /root/sys
+ mount -o bind /proc /root/proc
+ mount -o bind /dev /root/dev
mkdir -p /root/var/run/network
chroot /root dhclient eth0
if [ -z "${UNIONTYPE}" ]
then
- UNIONTYPE="unionfs"
+ UNIONTYPE="aufs"
export UNIONTYPE
fi
}
path="${1}"
uuid="$(cat /conf/uuid.conf)"
- for try_uuid_file in "${mountpoint}/.disk/casper-uuid"*
+ for try_uuid_file in "${mountpoint}/.disk/live-uuid"*
do
[ -e "${try_uuid_file}" ] || continue
{
case "${1}" in
*.squashfs|*.ext2|*.ext3|*.jffs2)
- echo $(setup_loop "${1}" "loop" "/sys/block/loop*" '0' "${LIVE_MEDIA_ENCRYPTION}")
+ echo $(setup_loop "${1}" "loop" "/sys/block/loop*" '0' "${LIVE_MEDIA_ENCRYPTION}" "${2}")
;;
*.dir)
{
directory="${1}"
rootmnt="${2}"
- mac="${3}"
+ mac="${3}"
if match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.squashfs" ||
if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-[^-]*-[ide|scsi|usb])"
then
return 0
+ elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'
+ then
+ return 0
fi
return 1
}
-is_supported_fs ()
-{
- # FIXME: do something better like the scan of supported filesystems
- fstype="${1}"
-
- case ${fstype} in
- vfat|iso9660|udf|ext2|ext3|ntfs|jffs2)
- return 0
- ;;
- esac
-
- return 1
-}
-
copy_live_to ()
{
copyfrom="${1}"
fstype=$(get_fstype "${dev}")
freespace=$(fs_size "${dev}")
else
- [ "$quiet" != "y" ] && log_warning_msg "${copytodev} is not a block device."
+ log_warning_msg "${copytodev} is not a block device."
return 1
fi
fi
if [ "${freespace}" -lt "${size}" ]
then
- [ "${quiet}" != "y" ] && log_warning_msg "Not enough free ${free_string} (${freespace}k free, ${size}k needed) to copy live media in ${copytodev}."
+ log_warning_msg "Not enough free ${free_string} (${freespace}k free, ${size}k needed) to copy live media in ${copytodev}."
return 1
fi
cd "${copyto}"
tar zxf "${copyfrom}/${LIVE_MEDIA_PATH}/$(basename ${FETCH})"
rm -f "${copyfrom}/${LIVE_MEDIA_PATH}/$(basename ${FETCH})"
- mount -r --move "${copyto}" "${rootmnt}"
+ mount -r -o move "${copyto}" "${rootmnt}"
cd "${OLDPWD}"
else
if [ -n "${MODULETORAMFILE}" ]
livefs_root
umount ${copyfrom}
- mount -r --move ${copyto} ${copyfrom}
+ mount -r -o move ${copyto} ${copyfrom}
fi
rmdir ${copyto}
modprobe -q af_packet # For DHCP
- udevtrigger
- udevsettle
+ if [ -x /sbin/udevadm ]
+ then
+ # lenny
+ udevadm trigger
+ udevadm settle
+ else
+ # etch
+ udevtrigger
+ udevsettle
+ fi
ipconfig ${DEVICE} | tee /netboot.config
NFSROOT=${ROOTSERVER}:${ROOTPATH}
fi
- if [ -n "${FETCH}" ] && do_httpmount
+ if ( [ -n "${FETCH}" ] || [ -n "${HTTPFS}" ] || [ -n "${FTPFS}" ] ) && do_httpmount
then
rc=0
return ${rc}
NFSROOT=${ROOTSERVER}:${NFSROOT}
fi
- [ "${quiet}" != "y" ] && log_begin_msg "Trying netboot from ${NFSROOT}"
+ log_begin_msg "Trying netboot from ${NFSROOT}"
if [ "${NETBOOT}" != "nfs" ] && do_cifsmount
then
rc=0
fi
- [ "${quiet}" != "y" ] && log_end_msg
+ log_end_msg
return ${rc}
}
do_httpmount ()
{
rc=1
- extension=$(echo "${FETCH}" | sed 's/\(.*\)\.\(.*\)/\2/')
-
- case "${extension}" in
- squashfs|tgz|tar)
- [ "${quiet}" != "y" ] && log_begin_msg "Trying wget ${FETCH} -O ${mountpoint}/$(basename ${FETCH})"
- mkdir -p "${mountpoint}/${LIVE_MEDIA_PATH}"
- wget "${FETCH}" -O "${mountpoint}/${LIVE_MEDIA_PATH}/$(basename ${FETCH})"
- [ ${?} -eq 0 ] && rc=0
- [ "${extension}" = "tgz" ] && live_dest="ram"
- ;;
+ dest="${mountpoint}/${LIVE_MEDIA_PATH}"
+ mount -t ramfs ram "${mountpoint}"
+ mkdir -p "${dest}"
- *)
- [ "${quiet}" != "y" ] && log_begin_msg "Unrecognized archive extension for ${FETCH}"
- esac
+ for webfile in HTTPFS FTPFS FETCH
+ do
+ url="$(eval echo \"\$\{${webfile}\}\")"
+ extension="$(echo "${url}" | sed 's/\(.*\)\.\(.*\)/\2/')"
+
+ if [ -n "$url" ]
+ then
+ case "${extension}" in
+ squashfs|tgz|tar)
+ if [ "${webfile}" = "FETCH" ]
+ 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
+ ;;
+
+ *)
+ log_begin_msg "Trying wget ${url} -O ${dest}/$(basename ${url})"
+ wget "${url}" -O "${dest}/$(basename ${url})"
+ ;;
+ esac
+ else
+ log_begin_msg "Trying to mount ${url} on ${dest}/$(basename ${url})"
+ if [ "${webfile}" = "FTPFS" ]
+ then
+ FUSE_MOUNT="curlftpfs"
+ url="$(dirname ${url})"
+ else
+ FUSE_MOUNT="httpfs"
+ fi
+ modprobe fuse
+ $FUSE_MOUNT "${url}" "${dest}"
+ fi
+ [ ${?} -eq 0 ] && rc=0
+ [ "${extension}" = "tgz" ] && live_dest="ram"
+ break
+ ;;
+
+ *)
+ log_begin_msg "Unrecognized archive extension for ${url}"
+ ;;
+ esac
+ fi
+ done
+
+ if [ ${rc} != 0 ]
+ then
+ umount "${mountpoint}"
+ fi
return ${rc}
}
NFSOPTS=""
fi
- [ "${quiet}" != "y" ] && log_begin_msg "Trying nfsmount -o nolock -o ro ${NFSOPTS} ${NFSROOT} ${mountpoint}"
+ log_begin_msg "Trying nfsmount -o nolock -o ro ${NFSOPTS} ${NFSROOT} ${mountpoint}"
# FIXME: This for loop is an ugly HACK round an nfs bug
for i in 0 1 2 3 4 5 6 7 8 9 a b c d e f 10 11 12 13
CIFSOPTS="${NFSOPTS}"
fi
- [ "${quiet}" != "y" ] && log_begin_msg "Trying mount.cifs ${NFSROOT} ${mountpoint} ${CIFSOPTS}"
+ log_begin_msg "Trying mount.cifs ${NFSROOT} ${mountpoint} ${CIFSOPTS}"
modprobe -q cifs
if mount.cifs "${NFSROOT}" "${mountpoint}" "${CIFSOPTS}"
if [ -n "${fstype}" ]
then
# Copying stuff...
- mount -t "${fstype}" -o ro,noatime "${fromdev}" "${tomount}"
+ mount -t "${fstype}" -o ro,noatime "${fromdev}" "${tomount}" || log_warning_msg "Error in mount -t ${fstype} -o ro,noatime ${fromdev} ${tomount}"
cp -a "${tomount}"/* ${todir}
umount "${tomount}"
else
else
return 1
- [ "${quiet}" != "y" ] && log_warning_msg "Unable to find the snapshot ${snap_type} medium"
+ log_warning_msg "Unable to find the snapshot ${snap_type} medium"
fi
}
if [ ! -z "${snapdata}" ]
then
+ log_success_msg "found snapshot: ${snapdata}"
snapdev="$(echo ${snapdata} | cut -f1 -d ' ')"
snapback="$(echo ${snapdata} | cut -f2 -d ' ')"
snapfile="$(echo ${snapdata} | cut -f3 -d ' ')"
+ RES=""
+
if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\|ext3\|jffs2\)'
then
# squashfs, jffs2 or ext2/ext3 snapshot
dev=$(get_backing_device "${snapback}/${snapfile}")
- if ! do_snap_copy "${dev}" "${snap_mount}" "${snap_type}"
- then
- log_warning_msg "Impossible to include the ${snapfile} Snapshot"
- return 1
- fi
+ do_snap_copy "${dev}" "${snap_mount}" "${snap_type}"
+ RES=$?
else
# cpio.gz snapshot
- if ! (cd "${snap_mount}" && zcat "${snapback}/${snapfile}" | cpio -i -u -d 2>/dev/null)
- then
- log_warning_msg "Impossible to include the ${snapfile} Snapshot"
- return 1
- fi
+ cd "${snap_mount}"
+ zcat "${snapback}/${snapfile}" | /bin/cpio --extract --preserve-modification-time --no-absolute-filenames --sparse --unconditional --make-directories > /dev/null 2>&1
+ RES=$?
+ cd "${OLDPWD}"
fi
umount "${snapback}"
+
+ if [ "${RES}" != "0" ]
+ then
+ log_warning_msg "Impossible to include the ${snapfile} Snapshot file"
+ fi
+
else
dev=$(find_cow_device "${snap_label}")
- if [ -b ${dev} ]
+ if [ -b "${dev}" ]
then
if echo "${dev}" | grep -qs loop
then
rofslist="${image} ${rofslist}"
elif [ -f "${image}" ]
then
- backdev=$(get_backing_device "${image}")
+ 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 [ "${fstype}" = "unknown" ]
panic "Unknown file system type on ${backdev} (${image})"
fi
+ if [ -z "${fstype}" ]
+ then
+ fstype="${imagename##*.}"
+ log_warning_msg "Unknown file system type on ${backdev} (${image}), assuming ${fstype}."
+ fi
+
mkdir -p "${croot}/${imagename}"
- echo "debug: Mounting backdev \"${backdev}\" (image = ${image}) on croot/imagename \"${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
modprobe -q -b ${module}
done
- udevtrigger
- udevsettle
+ if [ -x /sbin/udevadm ]
+ 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.
then
cowdevice=${cowprobe}
cow_fstype=$(get_fstype "${cowprobe}")
+ cow_mountopt="rw,noatime"
else
- [ "${quiet}" != "y" ] && log_warning_msg "Unable to find the persistent medium"
+ log_warning_msg "Unable to find the persistent medium"
cowdevice="tmpfs"
cow_fstype="tmpfs"
+ cow_mountopt="rw,noatime,mode=755"
fi
elif [ -n "${NFS_COW}" ] && [ -z "${NOPERSISTENT}" ]
then
else
cowdevice="tmpfs"
cow_fstype="tmpfs"
+ cow_mountopt="rw,noatime,mode=755"
fi
if [ "${cow_fstype}" = "nfs" ]
then
- [ "${quiet}" != "y" ] && log_begin_msg \
+ log_begin_msg \
"Trying nfsmount ${nfs_cow_opts} ${cowdevice} /cow"
nfsmount ${nfs_cow_opts} ${cowdevice} /cow || \
panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on /cow"
else
- mount -t ${cow_fstype} -o rw,noatime ${cowdevice} /cow || \
+ mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} /cow || \
panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on /cow"
fi
fi
# tmpfs file systems
+ touch /etc/fstab
mkdir -p "${rootmnt}/live"
mount -t tmpfs tmpfs ${rootmnt}/live
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"
+ log_warning_msg "Unable to find the persistent home medium"
fi
# Look for other snapshots to copy in
;;
*)
- mount --move "${d}" "${rootmnt}/live/${d##*/}"
+ mount -o move "${d}" "${rootmnt}/live/${d##*/}"
;;
esac
done
# shows cow fs on /cow for use by live-snapshot
mkdir -p "${rootmnt}/live/cow"
- mount -o move /cow "${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"
}
check_dev ()
devname=$(sys2dev "${sysdev}")
fi
+ if [ -d "${devname}" ]
+ then
+ mount -o bind "${devname}" $mountpoint || continue
+
+ if is_live_path $mountpoint
+ then
+ echo $mountpoint
+ return 0
+ else
+ umount $mountpoint
+ fi
+ fi
+
if [ -n "${LIVE_MEDIA_OFFSET}" ]
then
loopdevname=$(setup_loop "${devname}" "loop" "/sys/block/loop*" "${LIVE_MEDIA_OFFSET}" '')
fi
# or do the scan of block devices
- for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v 'dm-')
+ for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v 'dm-' | grep -v fd )
do
devname=$(sys2dev "${sysblock}")
fstype=$(get_fstype "${devname}")
if [ -x /sbin/usplash_write ]
then
/sbin/usplash_write "TIMEOUT 120"
- fi
+ else if [ -x /sbin/splashy_update ] ; then
+ /sbin/splashy_update "TIMEOUT 120"
+ fi ; fi
}
mountroot ()
{
-
if [ -x /scripts/local-top/cryptroot ]; then
/scripts/local-top/cryptroot
fi
exec 7>&2
exec > live.log
exec 2>&1
+ tail -f live.log >&7 &
+ tailpid="${!}"
+
+ # Ensure 'panic' function is overridden
+ . /scripts/live-functions
Arguments
set_usplash_timeout
- [ "${quiet}" != "y" ] && log_begin_msg "Running /scripts/live-premount"
+
+ maybe_break live-premount
+ log_begin_msg "Running /scripts/live-premount"
run_scripts /scripts/live-premount
- [ "${quiet}" != "y" ] && log_end_msg
+ log_end_msg
# Needed here too because some things (*cough* udev *cough*)
# changes the timeout
set_usplash_timeout
- if [ ! -z "${NETBOOT}" ] || [ ! -z "${FETCH}" ]
+ if [ ! -z "${NETBOOT}" ] || [ ! -z "${FETCH}" ] || [ ! -z "${HTTPFS}" ] || [ ! -z "${FTPFS}" ]
then
if do_netmount
then
log_end_msg
maybe_break live-bottom
- [ "${quiet}" != "y" ] && log_begin_msg "Running /scripts/live-bottom"
+ log_begin_msg "Running /scripts/live-bottom"
run_scripts /scripts/live-bottom
- [ "${quiet}" != "y" ] && log_end_msg
+ log_end_msg
exec 1>&6 6>&-
exec 2>&7 7>&-
+ kill ${tailpid}
cp live.log "${rootmnt}/var/log/"
}