Hello,
I've done some Casper patches (tested on 1.77, aka Etch version only)
to allow persistent data to be located on a NFS (or CIFS, not
tested) server. It works for me for persistent mounts, for snapshots,
I didn't tried, and the support is incomplete : the casper-snapshot
command isn't updated to support update of snapshots on nfs (at
reboot/shutdown...).
If the client has booted on NFS from a server with
path /some/path/to/binary, it will try to
mount /some/path/to/[<hostname>/]casper-rw
and /some/path/to/[<hostname>/]home-rw of the same server...
It can take quite a long time, as I reused NFS mounting procedure of
casper, which tries many times the same NFS mount (workaround of a
bug, but don't know which).
If you have questions about this, I can elaborate.
Hope it helps,
Fred.
diff -Naur casper-1.77/scripts/casper casper-1.77nfs/scripts/casper
--- casper-1.77/scripts/casper 2007-03-14 14:18:26.000000000 +0100
+++ casper-1.77nfs/scripts/casper 2007-03-14 14:17:50.000000000 +0100
@@ -89,6 +89,8 @@
export KMODEL=${x#*=} ;;
preseed/file=*|file=*)
export LOCATION="${x#*=}" ;;
+ debugcasper=*)
+ export DEBUGCASPER=${x#*=} ;;
*/*=*)
question="${x%%=*}"
value="${x#*=}"
@@ -221,7 +223,7 @@
return 0
}
-do_netmount() {
+do_rootnetmount() {
rc=1
modprobe "${MP_QUIET}" af_packet # For DHCP
@@ -234,63 +236,28 @@
[ "$quiet" != "y" ] && log_begin_msg "Trying netboot from ${NFSROOT}"
- if [ "${NETBOOT}" != "nfs" ] && do_cifsmount ; then
- rc=0
- elif do_nfsmount ; then
- NETBOOT="nfs"
- export NETBOOT
- rc=0
- fi
+ do_netmount "${NFSROOT}" "${mountpoint}" "-o ro" && rc=0
[ "$quiet" != "y" ] && log_end_msg
return ${rc}
}
-do_nfsmount() {
- rc=1
- modprobe "${MP_QUIET}" nfs
- if [ -z "${NFSOPTS}" ]; then
- NFSOPTS=""
- fi
-
- [ "$quiet" != "y" ] && 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; do
- nfsmount -o nolock -o ro ${NFSOPTS} "${NFSROOT}" "${mountpoint}" && rc=0 && break
- sleep 1
- done
- return ${rc}
-}
-
-do_cifsmount() {
- rc=1
- if [ -x "/sbin/mount.cifs" ]; then
- if [ -z "${NFSOPTS}" ]; then
- CIFSOPTS="-ouser=root,password="
- else
- CIFSOPTS="${NFSOPTS}"
- fi
-
- [ "$quiet" != "y" ] && log_begin_msg "Trying mount.cifs ${NFSROOT} ${mountpoint} ${CIFSOPTS}"
- modprobe "${MP_QUIET}" cifs
-
- if mount.cifs "${NFSROOT}" "${mountpoint}" "${CIFSOPTS}" ; then
- rc=0
- fi
- fi
- return ${rc}
-}
-
do_snap_copy ()
{
fromdev="${1}"
todir="${2}"
snap_type="${3}"
+ tomount="${4}"
+
+ if [ "${fromdev}" = nfs ]; then
+ # mount has be done in find_cow_device() !
+ cp -a "${tomount}"/* ${todir}
+ umount "${tomount}"
- size=$(fs_size "${fromdev}" "" "used")
+ elif [ -b "${fromdev}" ]; then
+ size=$(fs_size "${fromdev}" "" "used")
- if [ -b "${fromdev}" ]; then
- # look for free mem
+ # look for free mem # FIXME: not used ???
if [ -n "${HOMEMOUNTED}" -a "${snap_type}" = "HOME" ]; then
todev=$(cat /proc/mounts | grep -s " $(base_path ${todir}) " | awk '{print $1}' )
freespace=$(df -k | grep -s ${todev} | awk '{print $4}')
@@ -298,11 +265,6 @@
freespace=$( expr $(awk '/MemFree/{print $2}' /proc/meminfo) + $( cat /proc/meminfo | grep Cached | head -n 1 | awk '/Cached/{print $2}' - ))
fi
- tomount="/mnt/tmpsnap"
- if [ ! -d "${tomount}" ] ; then
- mkdir -p "${tomount}"
- fi
-
fstype=$(get_fstype "${fromdev}")
if [ -n "${fstype}" ]; then
# Copying stuff...
@@ -312,16 +274,17 @@
else
log_warning_msg "Unrecognized fstype: ${fstype} on ${fromdev}:${snap_type}"
fi
-
- rmdir "${tomount}"
if echo ${fromdev} | grep -qs loop; then
losetup -d "${fromdev}"
fi
- return 0
+
else
- return 1
[ "$quiet" != "y" ] && log_warning_msg "Unable to find the snapshot ${snap_type} medium"
+ return 1
fi
+
+ rmdir "${tomount}"
+ return 0
}
try_snap ()
@@ -333,6 +296,11 @@
snap_mount="${2}"
snap_type="${3}"
+ tomount="/mnt/tmpsnap"
+ if [ ! -d "${tomount}" ] ; then
+ mkdir -p "${tomount}"
+ fi
+
snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2")
if [ ! -z "${snapdata}" ]; then
snapdev="$(echo ${snapdata} | cut -f1 -d ' ')"
@@ -341,7 +309,8 @@
if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\)'; then
# squashfs or ext2 snapshot
dev=$(get_backing_device "${snapback}/${snapfile}")
- if ! do_snap_copy "${dev}" "${snap_mount}" "${snap_type}"; then
+ if ! do_snap_copy "${dev}" "${snap_mount}" "${snap_type}" \
+ "${tomount}"; then
log_warning_msg "Impossible to include the ${snapfile} Snapshot"
return 1
fi
@@ -353,9 +322,16 @@
fi
fi
umount "${snapback}"
+ rmdir "${tomount}"
+
else
- dev=$(find_cow_device "${snap_label}")
- if [ -b ${dev} ]; then
+ dev=$(find_cow_device "${snap_label}" "${tomount}")
+ if [ -z "${dev}" ]; then
+ log_warning_msg "Impossible to include the ${snap_label} Snapshot"
+ rmdir "${tomount}"
+ return 1
+
+ elif [ -b ${dev} ]; then
if echo "${dev}" | grep -qs loop; then
# strange things happens, user confused?
snaploop=$( losetup ${dev} | awk '{print $3}' | tr -d '()' )
@@ -364,7 +340,8 @@
else
snapdev="${dev}"
fi
- if ! do_snap_copy "${dev}" "${snap_mount}" "${snap_type}" ; then
+ if ! do_snap_copy "${dev}" "${snap_mount}" "${snap_type}" \
+ "${tomount}" ; then
log_warning_msg "Impossible to include the ${snap_label} Snapshot"
return 1
else
@@ -373,12 +350,22 @@
umount ${snapdev}
fi
fi
+
else
- log_warning_msg "Impossible to include the ${snap_label} Snapshot"
- return 1
+ # net mount
+ if ! do_snap_copy nfs "${snap_mount}" "${snap_type}" \
+ "${tomount}" ; then
+ log_warning_msg "Impossible to include the ${snap_label} Snapshot"
+ return 1
+ fi
fi
fi
- echo "export ${snap_type}SNAP="${snap_mount}":${snapdev}:${snapfile}" >> /etc/casper.conf # for resync on reboot/halt
+
+ # casper-snapshot don't know about nfs (yet)
+ if [ -b ${dev} ]; then
+ echo "export ${snap_type}SNAP="${snap_mount}":${snapdev}:${snapfile}" >> /etc/casper.conf # for resync on reboot/halt
+ fi
+
return 0
}
@@ -424,23 +411,29 @@
done
done
rofsstring=${rofsstring%:}
-
- mkdir -p /cow
cowdevice="tmpfs"
cow_fstype="tmpfs"
+ cowmount=/cow
+ mkdir -p ${cowmount}
- # Looking for "${root_persistence}" device or file
+ log_begin_msg "Looking for '${root_persistence}' device or file"
if [ -n "${PERSISTENT}" ]; then
- cowprobe=$(find_cow_device "${root_persistence}")
- if [ -b "${cowprobe}" ]; then
+ cowprobe=$(find_cow_device "${root_persistence}" ${cowmount})
+ if [ -z "${cowprobe}"]; then
+ log_warning_msg "Unable to find the persistent medium"
+
+ elif [ -b "${cowprobe}" ]; then
cowdevice=${cowprobe}
cow_fstype=$(get_fstype "${cowprobe}")
else
- [ "$quiet" != "y" ] && log_warning_msg "Unable to find the persistent medium"
+ cow_fstype=net
fi
fi
- mount ${cowdevice} -t ${cow_fstype} -o rw /cow || panic "Can not mount $cowdevice on /cow"
+ if [ "${cow_fstype}" != net ]
+ mount ${cowdevice} -t ${cow_fstype} -o rw ${cowmount} || panic "Can not mount $cowdevice on ${cowmount}"
+ fi
+ log_end_msg
mount -t unionfs -o dirs=/cow=rw:$rofsstring unionfs "$rootmnt" || panic "Unionfs mount failed"
@@ -448,15 +441,23 @@
if [ -n "${PERSISTENT}" ]; then
# directly mount /home
# FIXME: add a custom mounts configurable system
- homecow=$(find_cow_device "${home_persistence}" )
- if [ -b "${homecow}" ]; then
- mount -t $(get_fstype "${homecow}") -o rw "${homecow}" "${rootmnt}/home"
- export HOMEMOUNTED=1 # used to proper calculate free space in do_snap_copy()
- else
+ log_begin_msg "Looking for '${home_persistence}' device or file"
+ homemnt=${rootmnt}/home
+ homecow=$(find_cow_device "${home_persistence}" ${homemnt})
+ if [ -z "${homecow}"]; then
[ "$quiet" != "y" ] && log_warning_msg "Unable to find the persistent home medium"
+ else
+ if [ -b "${homecow}" ]; then
+ mount -t $(get_fstype "${homecow}") -o rw ${homecow} ${homemnt}
+ else
+ homecow=net
+ fi
+ export HOMEMOUNTED=1 # used to proper calculate free space in do_snap_copy()
fi
+ log_end_msg
+
# Look for other snapshots to copy in
- try_snap "${root_snapshot_label}" "${rootmnt}" "ROOT"
+ try_snap "${root_snapshot_label}" "${rootmnt}" "ROOT"
try_snap "${home_snapshot_label}" "${rootmnt}/home" "HOME"
fi
@@ -562,10 +563,12 @@
}
mountroot() {
- exec 6>&1
- exec 7>&2
- exec > casper.log
- exec 2>&1
+ if [ "${DEBUGCASPER}" != y ]; then
+ exec 6>&1
+ exec 7>&2
+ exec > casper.log
+ exec 2>&1
+ fi
parse_cmdline
@@ -581,7 +584,7 @@
set_usplash_timeout
if [ ! -z "${NETBOOT}" ]; then
- if do_netmount ; then
+ if do_rootnetmount ; then
livefs_root="${mountpoint}"
else
panic "Unable to find a the network rootfs live file system"
@@ -616,6 +619,11 @@
log_end_msg
+ if [ "${DEBUGCASPER}" = y ]; then
+ echo "Some Tests before continue (press 'exit' to continue) ?"
+ sh
+ fi
+
maybe_break casper-bottom
[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/casper-bottom"
@@ -623,7 +631,9 @@
run_scripts /scripts/casper-bottom
[ "$quiet" != "y" ] && log_end_msg
- exec 1>&6 6>&-
- exec 2>&7 7>&-
- cp casper.log "${rootmnt}/var/log/"
+ if [ "${DEBUGCASPER}" != y ]; then
+ exec 1>&6 6>&-
+ exec 2>&7 7>&-
+ cp casper.log "${rootmnt}/var/log/"
+ fi
}
diff -Naur casper-1.77/scripts/casper-helpers casper-1.77nfs/scripts/casper-helpers
--- casper-1.77/scripts/casper-helpers 2007-03-14 14:18:34.000000000 +0100
+++ casper-1.77nfs/scripts/casper-helpers 2007-03-14 14:17:50.000000000 +0100
@@ -146,6 +146,8 @@
find_cow_device() {
pers_label="${1}"
+ local mountpoint="${2}"
+
cow_backing="/${pers_label}-backing"
for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop); do
for dev in $(subdevices "${sysblock}"); do
@@ -165,6 +167,30 @@
fi
done
done
+
+ # try some paths from the same server we mounted root fs :
+ # - <rootServer>:<rootPathDir>/<hostname>
+ # - <rootServer>:<rootPathDir>
+ # with rootPathDir = parent directory of Casper's binary path
+ local rootPathDir=$(dirname ${NFSROOT})
+ local server=$(echo ${NFSROOT} | cut -d: -f1)
+ local host=$(cat /proc/sys/kernel/hostname)
+ local nfspath
+
+ if [ -z "${mountpoint}" ] || [ -z "${$NETBOOT}" ]; then return 1; fi
+
+ for nfspath in ${rootPathDir}/${host}/${pers_label} \
+ ${rootPathDir}/${pers_label} ; do
+ local path=$(echo ${nfspath} | cut -d: -f2)
+ [ "$quiet" != "y" ] && \
+ log_begin_msg "Trying to find cow device on net path ${nfspath}" >&2
+ if do_netmount "${nfspath}" "${mountpoint}" "-o rw"; then
+ echo "nfs"
+ return 0
+ fi
+ done
+
+ return 1
}
find_files()
@@ -193,3 +219,54 @@
}
+# Note : merge of do_netmount() [without net config], do_nfsmount()
+# and do_cifsmount()...
+do_netmount() {
+ local netroot=$1
+ local mountpoint=$2
+ local mountopts=$3
+
+ rc=1
+
+ # if NETBOOT is not set or not nfs, first try CIFS (Samba) :
+ if [ ! -z "${NETBOOT}" ] && [ "${NETBOOT}" != "nfs" ] && \
+ [ -x "/sbin/mount.cifs" ]; then
+ if [ -z "${NFSOPTS}" ]; then
+ CIFSOPTS="-ouser=root,password="
+ else
+ CIFSOPTS="${NFSOPTS}"
+ fi
+
+ _log_msg "Trying mount.cifs ${netroot} ${mountpoint} ${CIFSOPTS}..."
+ modprobe "${MP_QUIET}" cifs
+
+ if mount.cifs "${netroot}" "${mountpoint}" "${CIFSOPTS}"; then
+ rc=0
+ log_success_msg "Mounted ${netroot} as ${mountpoint}"
+ fi
+ fi
+ if [ ${rc} = 0 ]; then return ${rc}; fi
+
+ # try NFS if CIFS failed
+ modprobe "${MP_QUIET}" nfs
+### FIXME: ??? Do nothing, isn't it ???
+### if [ -z "${NFSOPTS}" ]; then
+### NFSOPTS=""
+### fi
+
+ _log_msg "Trying nfsmount -o nolock ${mountopts} ${NFSOPTS} ${netroot} ${mountpoint}"
+ # FIXME: This for loop is an ugly HACK round an nfs bug
+ # FIXMETOO: which one ?
+ for i in 0 1 2 3 4 5 6 7 8 9 a b c d e f 10 11 12 13; do
+ if nfsmount -o nolock ${mountopts} ${NFSOPTS} "${netroot}" "${mountpoint}"; then
+ rc=0
+ NETBOOT="nfs"
+ export NETBOOT
+ log_success_msg "Mounted ${netroot} as ${mountpoint}"
+ break
+ fi
+ sleep 1
+ done
+
+ return ${rc}
+}
diff -Naur casper-1.81/scripts/casper casper-1.81nfs/scripts/casper
--- casper-1.81/scripts/casper 2007-03-14 14:24:41.000000000 +0100
+++ casper-1.81nfs/scripts/casper 2007-03-14 14:36:58.000000000 +0100
@@ -93,6 +93,8 @@
export MODULE=${x#module=} ;;
preseed/file=*|file=*)
export LOCATION="${x#*=}" ;;
+ debugcasper=*)
+ export DEBUGCASPER=${x#*=} ;;
*/*=*)
question="${x%%=*}"
value="${x#*=}"
@@ -228,7 +230,7 @@
return 0
}
-do_netmount() {
+do_rootnetmount() {
rc=1
modprobe "${MP_QUIET}" af_packet # For DHCP
@@ -241,63 +243,28 @@
[ "$quiet" != "y" ] && log_begin_msg "Trying netboot from ${NFSROOT}"
- if [ "${NETBOOT}" != "nfs" ] && do_cifsmount ; then
- rc=0
- elif do_nfsmount ; then
- NETBOOT="nfs"
- export NETBOOT
- rc=0
- fi
+ do_netmount "${NFSROOT}" "${mountpoint}" "-o ro" && rc=0
[ "$quiet" != "y" ] && log_end_msg
return ${rc}
}
-do_nfsmount() {
- rc=1
- modprobe "${MP_QUIET}" nfs
- if [ -z "${NFSOPTS}" ]; then
- NFSOPTS=""
- fi
-
- [ "$quiet" != "y" ] && 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; do
- nfsmount -o nolock -o ro ${NFSOPTS} "${NFSROOT}" "${mountpoint}" && rc=0 && break
- sleep 1
- done
- return ${rc}
-}
-
-do_cifsmount() {
- rc=1
- if [ -x "/sbin/mount.cifs" ]; then
- if [ -z "${NFSOPTS}" ]; then
- CIFSOPTS="-ouser=root,password="
- else
- CIFSOPTS="${NFSOPTS}"
- fi
-
- [ "$quiet" != "y" ] && log_begin_msg "Trying mount.cifs ${NFSROOT} ${mountpoint} ${CIFSOPTS}"
- modprobe "${MP_QUIET}" cifs
-
- if mount.cifs "${NFSROOT}" "${mountpoint}" "${CIFSOPTS}" ; then
- rc=0
- fi
- fi
- return ${rc}
-}
-
do_snap_copy ()
{
fromdev="${1}"
todir="${2}"
snap_type="${3}"
+ tomount="${4}"
- size=$(fs_size "${fromdev}" "" "used")
+ if [ "${fromdev}" = nfs ]; then
+ # mount has be done in find_cow_device() !
+ cp -a "${tomount}"/* ${todir}
+ umount "${tomount}"
- if [ -b "${fromdev}" ]; then
- # look for free mem
+ elif [ -b "${fromdev}" ]; then
+ size=$(fs_size "${fromdev}" "" "used")
+
+ # look for free mem # FIXME: not used ???
if [ -n "${HOMEMOUNTED}" -a "${snap_type}" = "HOME" ]; then
todev=$(cat /proc/mounts | grep -s " $(base_path ${todir}) " | awk '{print $1}' )
freespace=$(df -k | grep -s ${todev} | awk '{print $4}')
@@ -305,11 +272,6 @@
freespace=$( expr $(awk '/MemFree/{print $2}' /proc/meminfo) + $( cat /proc/meminfo | grep Cached | head -n 1 | awk '/Cached/{print $2}' - ))
fi
- tomount="/mnt/tmpsnap"
- if [ ! -d "${tomount}" ] ; then
- mkdir -p "${tomount}"
- fi
-
fstype=$(get_fstype "${fromdev}")
if [ -n "${fstype}" ]; then
# Copying stuff...
@@ -319,16 +281,17 @@
else
log_warning_msg "Unrecognized fstype: ${fstype} on ${fromdev}:${snap_type}"
fi
-
- rmdir "${tomount}"
if echo ${fromdev} | grep -qs loop; then
losetup -d "${fromdev}"
fi
- return 0
+
else
- return 1
[ "$quiet" != "y" ] && log_warning_msg "Unable to find the snapshot ${snap_type} medium"
+ return 1
fi
+
+ rmdir "${tomount}"
+ return 0
}
try_snap ()
@@ -340,6 +303,11 @@
snap_mount="${2}"
snap_type="${3}"
+ tomount="/mnt/tmpsnap"
+ if [ ! -d "${tomount}" ] ; then
+ mkdir -p "${tomount}"
+ fi
+
snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2")
if [ ! -z "${snapdata}" ]; then
snapdev="$(echo ${snapdata} | cut -f1 -d ' ')"
@@ -348,7 +316,8 @@
if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\)'; then
# squashfs or ext2 snapshot
dev=$(get_backing_device "${snapback}/${snapfile}")
- if ! do_snap_copy "${dev}" "${snap_mount}" "${snap_type}"; then
+ if ! do_snap_copy "${dev}" "${snap_mount}" "${snap_type}" \
+ "${tomount}"; then
log_warning_msg "Impossible to include the ${snapfile} Snapshot"
return 1
fi
@@ -360,9 +329,16 @@
fi
fi
umount "${snapback}"
+ rmdir "${tomount}"
+
else
- dev=$(find_cow_device "${snap_label}")
- if [ -b ${dev} ]; then
+ dev=$(find_cow_device "${snap_label}" "${tomount}")
+ if [ -z "${dev}" ]; then
+ log_warning_msg "Impossible to include the ${snap_label} Snapshot"
+ rmdir "${tomount}"
+ return 1
+
+ elif [ -b ${dev} ]; then
if echo "${dev}" | grep -qs loop; then
# strange things happens, user confused?
snaploop=$( losetup ${dev} | awk '{print $3}' | tr -d '()' )
@@ -371,7 +347,8 @@
else
snapdev="${dev}"
fi
- if ! do_snap_copy "${dev}" "${snap_mount}" "${snap_type}" ; then
+ if ! do_snap_copy "${dev}" "${snap_mount}" "${snap_type}" \
+ "${tomount}" ; then
log_warning_msg "Impossible to include the ${snap_label} Snapshot"
return 1
else
@@ -380,12 +357,22 @@
umount ${snapdev}
fi
fi
+
else
- log_warning_msg "Impossible to include the ${snap_label} Snapshot"
- return 1
+ # net mount
+ if ! do_snap_copy nfs "${snap_mount}" "${snap_type}" \
+ "${tomount}" ; then
+ log_warning_msg "Impossible to include the ${snap_label} Snapshot"
+ return 1
+ fi
fi
fi
- echo "export ${snap_type}SNAP="${snap_mount}":${snapdev}:${snapfile}" >> /etc/casper.conf # for resync on reboot/halt
+
+ # casper-snapshot don't know about nfs (yet)
+ if [ -b ${dev} ]; then
+ echo "export ${snap_type}SNAP="${snap_mount}":${snapdev}:${snapfile}" >> /etc/casper.conf # for resync on reboot/halt
+ fi
+
return 0
}
@@ -448,24 +435,29 @@
done
rofsstring=${rofsstring%:}
-
- mkdir -p /cow
-
cowdevice="tmpfs"
cow_fstype="tmpfs"
+ cowmount=/cow
+ mkdir -p ${cowmount}
- # Looking for "${root_persistence}" device or file
+ log_begin_msg "Looking for '${root_persistence}' device or file"
if [ -n "${PERSISTENT}" ]; then
- cowprobe=$(find_cow_device "${root_persistence}")
- if [ -b "${cowprobe}" ]; then
+ cowprobe=$(find_cow_device "${root_persistence}" ${cowmount})
+ if [ -z "${cowprobe}"]; then
+ log_warning_msg "Unable to find the persistent medium"
+
+ elif [ -b "${cowprobe}" ]; then
cowdevice=${cowprobe}
cow_fstype=$(get_fstype "${cowprobe}")
else
- [ "$quiet" != "y" ] && log_warning_msg "Unable to find the persistent medium"
+ cow_fstype=net
fi
fi
- mount ${cowdevice} -t ${cow_fstype} -o rw /cow || panic "Can not mount $cowdevice on /cow"
+ if [ "${cow_fstype}" != net ]
+ mount ${cowdevice} -t ${cow_fstype} -o rw ${cowmount} || panic "Can not mount $cowdevice on ${cowmount}"
+ fi
+ log_end_msg
mount -t unionfs -o dirs=/cow=rw:$rofsstring unionfs "$rootmnt" || panic "Unionfs mount failed"
@@ -473,15 +465,23 @@
if [ -n "${PERSISTENT}" ]; then
# directly mount /home
# FIXME: add a custom mounts configurable system
- homecow=$(find_cow_device "${home_persistence}" )
- if [ -b "${homecow}" ]; then
- mount -t $(get_fstype "${homecow}") -o rw "${homecow}" "${rootmnt}/home"
- export HOMEMOUNTED=1 # used to proper calculate free space in do_snap_copy()
- else
+ log_begin_msg "Looking for '${home_persistence}' device or file"
+ homemnt=${rootmnt}/home
+ homecow=$(find_cow_device "${home_persistence}" ${homemnt})
+ if [ -z "${homecow}"]; then
[ "$quiet" != "y" ] && log_warning_msg "Unable to find the persistent home medium"
+ else
+ if [ -b "${homecow}" ]; then
+ mount -t $(get_fstype "${homecow}") -o rw ${homecow} ${homemnt}
+ else
+ homecow=net
+ fi
+ export HOMEMOUNTED=1 # used to proper calculate free space in do_snap_copy()
fi
+ log_end_msg
+
# Look for other snapshots to copy in
- try_snap "${root_snapshot_label}" "${rootmnt}" "ROOT"
+ try_snap "${root_snapshot_label}" "${rootmnt}" "ROOT"
try_snap "${home_snapshot_label}" "${rootmnt}/home" "HOME"
fi
@@ -587,10 +587,12 @@
}
mountroot() {
- exec 6>&1
- exec 7>&2
- exec > casper.log
- exec 2>&1
+ if [ "${DEBUGCASPER}" != y ]; then
+ exec 6>&1
+ exec 7>&2
+ exec > casper.log
+ exec 2>&1
+ fi
parse_cmdline
@@ -606,7 +608,7 @@
set_usplash_timeout
if [ ! -z "${NETBOOT}" ]; then
- if do_netmount ; then
+ if do_rootnetmount ; then
livefs_root="${mountpoint}"
else
panic "Unable to find a the network rootfs live file system"
@@ -641,6 +643,11 @@
log_end_msg
+ if [ "${DEBUGCASPER}" = y ]; then
+ echo "Some Tests before continue (press 'exit' to continue) ?"
+ sh
+ fi
+
maybe_break casper-bottom
[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/casper-bottom"
@@ -648,7 +655,9 @@
run_scripts /scripts/casper-bottom
[ "$quiet" != "y" ] && log_end_msg
- exec 1>&6 6>&-
- exec 2>&7 7>&-
- cp casper.log "${rootmnt}/var/log/"
+ if [ "${DEBUGCASPER}" != y ]; then
+ exec 1>&6 6>&-
+ exec 2>&7 7>&-
+ cp casper.log "${rootmnt}/var/log/"
+ fi
}
diff -Naur casper-1.81/scripts/casper~ casper-1.81nfs/scripts/casper~
--- casper-1.81/scripts/casper~ 1970-01-01 01:00:00.000000000 +0100
+++ casper-1.81nfs/scripts/casper~ 2007-03-14 14:23:23.000000000 +0100
@@ -0,0 +1,639 @@
+#!/bin/sh
+
+# set -e
+
+export PATH=/root/usr/bin:/root/usr/sbin:/root/bin:/root/sbin:/usr/bin:/usr/sbin:/bin:/sbin
+
+mountpoint=/live_media
+
+root_persistence="casper-rw"
+home_persistence="home-rw"
+root_snapshot_label="casper-sn"
+home_snapshot_label="home-sn"
+
+USERNAME="casper"
+USERFULLNAME="Live session user"
+HOSTNAME="live"
+BUILD_SYSTEM="Debian"
+
+mkdir -p $mountpoint
+
+[ -f /etc/casper.conf ] && . /etc/casper.conf
+export USERNAME USERFULLNAME HOSTNAME BUILD_SYSTEM
+
+. /scripts/casper-helpers
+
+if [ ! -f /casper.vars ]; then
+ touch /casper.vars
+fi
+
+parse_cmdline ()
+{
+ PRESEEDS=
+ # looking for casper specifics options as kernel parameters
+ for x in $(cat /proc/cmdline); do
+ case $x in
+ userfullname=*)
+ export USERFULLNAME=${x#userfullname=}
+ export CASPERCONF="changed"
+ ;;
+ hostname=*)
+ export HOSTNAME=${x#hostname=}
+ export CASPERCONF="changed"
+ ;;
+ username=*)
+ export USERNAME=${x#username=}
+ export CASPERCONF="changed"
+ ;;
+ netboot*)
+ export NETBOOT=${x#netboot=} ;;
+ access=*)
+ export ACCESS=${x#access=} ;;
+ xdebconf)
+ export XDEBCONF="Yes" ;;
+ toram)
+ export TORAM="Yes" ;;
+ todisk=*)
+ export TODISK=${x#todisk=} ;;
+ showmounts)
+ export SHOWMOUNTS="Yes" ;;
+ persistent)
+ export PERSISTENT="Yes" ;;
+ nopersistent)
+ export PERSISTENT="" ;;
+ ip*)
+ STATICIP=${x#ip=}
+ if [ "${STATICIP}" == "" ]; then
+ STATICIP="frommedia"
+ fi
+ export STATICIP ;;
+ casper-getty)
+ export CASPERGETTY=1 ;;
+ bootfrom=*|live-media=*)
+ export LIVEMEDIA=${x#*=} ;;
+ live-media-timeout=*)
+ export LIVEMEDIA_TIMEOUT=${x#live-media-timeout=} ;;
+ live-media-offset=*)
+ export LIVEMEDIA_OFFSET=${x#live-media-offset=} ;;
+ locale=*|debian-installer/locale=*)
+ export LOCALE=${x#*=} ;;
+ keyb=*|kbd-chooser/method=*)
+ export KBD=${x#*=} ;;
+ klayout=*|console-setup/layoutcode=*)
+ export KLAYOUT=${x#*=} ;;
+ koptions=*)
+ export KOPTIONS=${x#koptions=} ;;
+ kvariant=*|console-setup/variantcode=*)
+ export KVARIANT=${x#*=} ;;
+ kmodel=*|console-setup/modelcode=*)
+ export KMODEL=${x#*=} ;;
+ preseed/file=*|file=*)
+ export LOCATION="${x#*=}" ;;
+ debugcasper=*)
+ export DEBUGCASPER=${x#*=} ;;
+ */*=*)
+ question="${x%%=*}"
+ value="${x#*=}"
+ PRESEEDS="${PRESEEDS}\"${question}=${value}\" "
+ ;;
+ console=*)
+ export DEFCONSOLE="${x#*=}" ;;
+ esac
+ done
+
+ # sort of compatibility with netboot.h from linux docs
+ if [ -z "${NETBOOT}" ]; then
+ if [ "${ROOT}" == "/dev/nfs" ]; then
+ NETBOOT="nfs"
+ export NETBOOT
+ elif [ "${ROOT}" == "/dev/cifs" ]; then
+ NETBOOT="cifs"
+ export NETBOOT
+ fi
+ fi
+}
+
+is_casper_path() {
+ path=$1
+ if [ -d "$path/casper" ]; then
+ if [ "$(echo $path/casper/*.squashfs)" != "$path/casper/*.squashfs" ] ||
+ [ "$(echo $path/casper/*.ext2)" != "$path/casper/*.ext2" ] ||
+ [ "$(echo $path/casper/*.dir)" != "$path/casper/*.dir" ]; then
+ return 0
+ fi
+ fi
+ return 1
+}
+
+get_backing_device() {
+ case "$1" in
+ *.squashfs|*.ext2)
+ echo $(setup_loop "$1" "loop" "/sys/block/loop*")
+ ;;
+ *.dir)
+ echo "directory"
+ ;;
+ *)
+ panic "Unrecognized casper filesystem: $1"
+ ;;
+ esac
+}
+
+match_files_in_dir() {
+ # Does any files match pattern $1 ?
+
+ local pattern="$1"
+ if [ "$(echo $pattern)" != "$pattern" ]; then
+ return 0
+ fi
+ return 1
+}
+
+mount_images_in_directory() {
+ directory="$1"
+ rootmnt="$2"
+ if match_files_in_dir "$directory/casper/*.squashfs" ||
+ match_files_in_dir "$directory/casper/*.ext2" ||
+ match_files_in_dir "$directory/casper/*.dir"; then
+ setup_unionfs "$directory/casper" "$rootmnt"
+ else
+ :
+ fi
+}
+
+is_nice_device() {
+ sysfs_path="${1#/sys}"
+ if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-[^-]*-[ide|scsi|usb])"; 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)
+ return 0
+ ;;
+ esac
+ return 1
+}
+
+copy_live_to() {
+ copyfrom="${1}"
+ copytodev="${2}"
+ copyto="${copyfrom}_swap"
+
+ size=$(fs_size "" ${copyfrom} "used")
+
+ if [ "${copytodev}" = "ram" ]; then
+ # copying to ram:
+ freespace=$( expr $(awk '/MemFree/{print $2}' /proc/meminfo) + $( cat /proc/meminfo | grep Cached | head -n 1 | awk '/Cached/{print $2}' - ) )
+ mount_options="-o size=${size}k"
+ free_string="memory"
+ fstype="tmpfs"
+ dev="/dev/shm"
+ else
+ # it should be a writable block device
+ if [ -b "${copytodev}" ]; then
+ dev="${copytodev}"
+ free_string="space"
+ fstype=$(get_fstype "${dev}")
+ freespace=$(fs_size "${dev}")
+ else
+ [ "$quiet" != "y" ] && 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 > ${size}k) to copy live media in ${copytodev}."
+ return 1
+ fi
+
+ # begin copying..
+ mkdir "${copyto}"
+ echo "mount -t ${fstype} ${mount_options} ${dev} ${copyto}"
+ mount -t "${fstype}" ${mount_options} "${dev}" "${copyto}"
+ cp -a ${copyfrom}/* ${copyto} # "cp -a" from busybox also copies hidden files
+ umount ${copyfrom}
+ mount -r -o move ${copyto} ${copyfrom}
+ rmdir ${copyto}
+ return 0
+}
+
+do_rootnetmount() {
+ rc=1
+
+ modprobe "${MP_QUIET}" af_packet # For DHCP
+
+ ipconfig ${DEVICE} /tmp/net-${DEVICE}.conf | tee /netboot.config
+
+ if [ "${NFSROOT}" = "auto" ]; then
+ NFSROOT=${ROOTSERVER}:${ROOTPATH}
+ fi
+
+ [ "$quiet" != "y" ] && log_begin_msg "Trying netboot from ${NFSROOT}"
+
+ do_netmount "${NFSROOT}" "${mountpoint}" "-o ro" && rc=0
+
+ [ "$quiet" != "y" ] && log_end_msg
+ return ${rc}
+}
+
+do_snap_copy ()
+{
+ fromdev="${1}"
+ todir="${2}"
+ snap_type="${3}"
+ tomount="${4}"
+
+ if [ "${fromdev}" = nfs ]; then
+ # mount has be done in find_cow_device() !
+ cp -a "${tomount}"/* ${todir}
+ umount "${tomount}"
+
+ elif [ -b "${fromdev}" ]; then
+ size=$(fs_size "${fromdev}" "" "used")
+
+ # look for free mem # FIXME: not used ???
+ if [ -n "${HOMEMOUNTED}" -a "${snap_type}" = "HOME" ]; then
+ todev=$(cat /proc/mounts | grep -s " $(base_path ${todir}) " | awk '{print $1}' )
+ freespace=$(df -k | grep -s ${todev} | awk '{print $4}')
+ else
+ freespace=$( expr $(awk '/MemFree/{print $2}' /proc/meminfo) + $( cat /proc/meminfo | grep Cached | head -n 1 | awk '/Cached/{print $2}' - ))
+ fi
+
+ fstype=$(get_fstype "${fromdev}")
+ if [ -n "${fstype}" ]; then
+ # Copying stuff...
+ mount -t "${fstype}" -o ro "${fromdev}" "${tomount}"
+ cp -a "${tomount}"/* ${todir}
+ umount "${tomount}"
+ else
+ log_warning_msg "Unrecognized fstype: ${fstype} on ${fromdev}:${snap_type}"
+ fi
+ if echo ${fromdev} | grep -qs loop; then
+ losetup -d "${fromdev}"
+ fi
+
+ else
+ [ "$quiet" != "y" ] && log_warning_msg "Unable to find the snapshot ${snap_type} medium"
+ return 1
+ fi
+
+ rmdir "${tomount}"
+ return 0
+}
+
+try_snap ()
+{
+ # Look for $snap_label.* in block devices and copy the contents to $snap_mount
+ # and remember the device and filename for resync on exit in casper.init
+
+ snap_label="${1}"
+ snap_mount="${2}"
+ snap_type="${3}"
+
+ tomount="/mnt/tmpsnap"
+ if [ ! -d "${tomount}" ] ; then
+ mkdir -p "${tomount}"
+ fi
+
+ snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2")
+ if [ ! -z "${snapdata}" ]; then
+ snapdev="$(echo ${snapdata} | cut -f1 -d ' ')"
+ snapback="$(echo ${snapdata} | cut -f2 -d ' ')"
+ snapfile="$(echo ${snapdata} | cut -f3 -d ' ')"
+ if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\)'; then
+ # squashfs or ext2 snapshot
+ dev=$(get_backing_device "${snapback}/${snapfile}")
+ if ! do_snap_copy "${dev}" "${snap_mount}" "${snap_type}" \
+ "${tomount}"; then
+ log_warning_msg "Impossible to include the ${snapfile} Snapshot"
+ return 1
+ fi
+ 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
+ fi
+ umount "${snapback}"
+ rmdir "${tomount}"
+
+ else
+ dev=$(find_cow_device "${snap_label}" "${tomount}")
+ if [ -z "${dev}" ]; then
+ log_warning_msg "Impossible to include the ${snap_label} Snapshot"
+ rmdir "${tomount}"
+ return 1
+
+ elif [ -b ${dev} ]; then
+ if echo "${dev}" | grep -qs loop; then
+ # strange things happens, user confused?
+ snaploop=$( losetup ${dev} | awk '{print $3}' | tr -d '()' )
+ snapfile=$(basename ${snaploop})
+ snapdev=$(cat /proc/mounts | awk '{print $2,$1}' | grep -es "^$( dirname ${snaploop} )" | cut -f2 -d ' ')
+ else
+ snapdev="${dev}"
+ fi
+ if ! do_snap_copy "${dev}" "${snap_mount}" "${snap_type}" \
+ "${tomount}" ; then
+ log_warning_msg "Impossible to include the ${snap_label} Snapshot"
+ return 1
+ else
+ if [ -n "${snapfile}" ]; then
+ # it was a loop device, user confused
+ umount ${snapdev}
+ fi
+ fi
+
+ else
+ # net mount
+ if ! do_snap_copy nfs "${snap_mount}" "${snap_type}" \
+ "${tomount}" ; then
+ log_warning_msg "Impossible to include the ${snap_label} Snapshot"
+ return 1
+ fi
+ fi
+ fi
+
+ # casper-snapshot don't know about nfs (yet)
+ if [ -b ${dev} ]; then
+ echo "export ${snap_type}SNAP="${snap_mount}":${snapdev}:${snapfile}" >> /etc/casper.conf # for resync on reboot/halt
+ fi
+
+ return 0
+}
+
+setup_unionfs() {
+ image_directory="$1"
+ rootmnt="$2"
+
+ modprobe "${MP_QUIET}" -b unionfs
+
+ # 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,
+ # put them in / since move-mounting them into / breaks mono and
+ # some other apps.
+
+ croot="/"
+
+ # Let's just mount the read-only file systems first
+ rofsstring=""
+ rofslist=""
+ if [ "${NETBOOT}" == "nfs" ] ; then
+ roopt="nfsro" # go aroung a bug in nfs-unionfs locking
+ else
+ roopt="ro"
+ fi
+
+ mkdir -p "${croot}"
+ for image_type in "ext2" "squashfs" "dir" ; do
+ for image in "${image_directory}"/*."${image_type}"; do
+ imagename=$(basename "${image}")
+ if [ -d "${image}" ]; then
+ # it is a plain directory: do nothing
+ rofsstring="${image}=${roopt}:${rofsstring}"
+ rofslist="${image} ${rofslist}"
+ elif [ -f "${image}" ]; then
+ backdev=$(get_backing_device "$image")
+ fstype=$(get_fstype "${backdev}")
+ if [ "${fstype}" = "unknown" ]; then
+ panic "Unknown file system type on ${backdev} (${image})"
+ fi
+ mkdir -p "${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}"
+ fi
+ done
+ done
+ rofsstring=${rofsstring%:}
+ cowdevice="tmpfs"
+ cow_fstype="tmpfs"
+ cowmount=/cow
+ mkdir -p ${cowmount}
+
+ log_begin_msg "Looking for '${root_persistence}' device or file"
+ if [ -n "${PERSISTENT}" ]; then
+ cowprobe=$(find_cow_device "${root_persistence}" ${cowmount})
+ if [ -z "${cowprobe}"]; then
+ log_warning_msg "Unable to find the persistent medium"
+
+ elif [ -b "${cowprobe}" ]; then
+ cowdevice=${cowprobe}
+ cow_fstype=$(get_fstype "${cowprobe}")
+ else
+ cow_fstype=net
+ fi
+ fi
+
+ if [ "${cow_fstype}" != net ]
+ mount ${cowdevice} -t ${cow_fstype} -o rw ${cowmount} || panic "Can not mount $cowdevice on ${cowmount}"
+ fi
+ log_end_msg
+
+ mount -t unionfs -o dirs=/cow=rw:$rofsstring unionfs "$rootmnt" || panic "Unionfs mount failed"
+
+ # Adding other custom mounts
+ if [ -n "${PERSISTENT}" ]; then
+ # directly mount /home
+ # FIXME: add a custom mounts configurable system
+ log_begin_msg "Looking for '${home_persistence}' device or file"
+ homemnt=${rootmnt}/home
+ homecow=$(find_cow_device "${home_persistence}" ${homemnt})
+ if [ -z "${homecow}"]; then
+ [ "$quiet" != "y" ] && log_warning_msg "Unable to find the persistent home medium"
+ else
+ if [ -b "${homecow}" ]; then
+ mount -t $(get_fstype "${homecow}") -o rw ${homecow} ${homemnt}
+ else
+ homecow=net
+ fi
+ export HOMEMOUNTED=1 # used to proper calculate free space in do_snap_copy()
+ fi
+ log_end_msg
+
+ # Look for other snapshots to copy in
+ try_snap "${root_snapshot_label}" "${rootmnt}" "ROOT"
+ try_snap "${home_snapshot_label}" "${rootmnt}/home" "HOME"
+ fi
+
+ if [ -n "${SHOWMOUNTS}" ]; then
+ for d in ${rofslist}; do
+ mkdir -p "${rootmnt}/casper/${d##*/}"
+ case d in
+ *.dir) # do nothing # mount -o bind "${d}" "${rootmnt}/casper/${d##*/}"
+ ;;
+ *) mount -o move "${d}" "${rootmnt}/casper/${d##*/}"
+ ;;
+ esac
+ done
+ fi
+
+ # shows cow fs on /cow for use by casper-snapshot
+ mkdir -p "${rootmnt}/cow"
+ mount -o bind /cow "${rootmnt}/cow"
+}
+
+check_dev ()
+{
+ sysdev="${1}"
+ devname="${2}"
+ if [ -z "${devname}" ]; then
+ devname=$(sys2dev "${sysdev}")
+ fi
+
+ if [ -n "${LIVEMEDIA_OFFSET}" ]; then
+ loopdevname=$(setup_loop "${devname}" "loop" "/sys/block/loop*" "${LIVEMEDIA_OFFSET}")
+ devname="${loopdevname}"
+ fi
+
+ fstype=$(get_fstype "${devname}")
+ if is_supported_fs ${fstype}; then
+ mount -t ${fstype} -o ro "${devname}" $mountpoint || continue
+ if is_casper_path $mountpoint; then
+ echo $mountpoint
+ return 0
+ else
+ umount $mountpoint
+ fi
+ fi
+
+ if [ -n "${LIVEMEDIA_OFFSET}" ]; then
+ losetup -d "${loopdevname}"
+ fi
+ return 1
+}
+
+find_livefs() {
+ timeout="${1}"
+ # first look at the one specified in the command line
+ if [ ! -z "${LIVEMEDIA}" ]; then
+ if check_dev "null" "${LIVEMEDIA}"; then
+ return 0
+ fi
+ fi
+ # don't start autodetection before timeout has expired
+ if [ -n "${LIVEMEDIA_TIMEOUT}" ]; then
+ if [ "${timeout}" -lt "${LIVEMEDIA_TIMEOUT}" ]; then
+ return 1
+ fi
+ fi
+ # or do the scan of block devices
+ for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram); do
+ devname=$(sys2dev "${sysblock}")
+ fstype=$(get_fstype "${devname}")
+ if /lib/udev/cdrom_id ${devname} > /dev/null; then
+ if check_dev "null" "${devname}" ; then
+ return 0
+ fi
+ elif is_nice_device "${sysblock}" ; then
+ for dev in $(subdevices "${sysblock}"); do
+ if check_dev "${dev}" ; then
+ return 0
+ fi
+ done
+ elif [ "${fstype}" = "squashfs" -o \
+ "${fstype}" = "ext3" -o \
+ "${fstype}" = "ext2" ]; then
+ # This is an ugly hack situation, the block device has
+ # an image directly on it. It's hopefully
+ # casper, so take it and run with it.
+ ln -s "${devname}" "${devname}.${fstype}"
+ echo "${devname}.${fstype}"
+ return 0
+ fi
+ done
+ return 1
+}
+
+pulsate() {
+ if [ -x /sbin/usplash_write ]; then
+ /sbin/usplash_write "PULSATE"
+ fi
+}
+
+set_usplash_timeout() {
+ if [ -x /sbin/usplash_write ]; then
+ /sbin/usplash_write "TIMEOUT 120"
+ fi
+}
+
+mountroot() {
+ if [ "${DEBUGCASPER}" != y ]; then
+ exec 6>&1
+ exec 7>&2
+ exec > casper.log
+ exec 2>&1
+ fi
+
+ parse_cmdline
+
+ set_usplash_timeout
+ [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/casper-premount"
+ pulsate
+ run_scripts /scripts/casper-premount
+ [ "$quiet" != "y" ] && log_end_msg
+
+ # Needed here too because some things (*cough* udev *cough*)
+ # changes the timeout
+
+ set_usplash_timeout
+
+ if [ ! -z "${NETBOOT}" ]; then
+ if do_rootnetmount ; then
+ livefs_root="${mountpoint}"
+ else
+ panic "Unable to find a the network rootfs live file system"
+ fi
+ else
+ # Scan local devices for the image
+ for i in 0 1 2 3 4 5 6 7 8 9 a b c d e f 10 11 12 13; do
+ livefs_root=$(find_livefs $i)
+ if [ -n "${livefs_root}" ]; then
+ break
+ fi
+ sleep 1
+ done
+ fi
+
+ if [ -z "${livefs_root}" ]; then
+ panic "Unable to find a medium containing a live file system"
+ fi
+
+ if [ -n "${TORAM}" ]; then
+ live_dest="ram"
+ elif [ -n "${TODISK}" ]; then
+ live_dest="${TODISK}"
+ fi
+ if [ -n "${live_dest}" ]; then
+ [ "$quiet" != "y" ] && log_begin_msg "Copying live_media to ${live_dest}"
+ copy_live_to "${livefs_root}" "${live_dest}"
+ [ "$quiet" != "y" ] && log_end_msg
+ fi
+
+ mount_images_in_directory "${livefs_root}" "${rootmnt}"
+
+ log_end_msg
+
+ if [ "${DEBUGCASPER}" = y ]; then
+ echo "Some Tests before continue (press 'exit' to continue) ?"
+ sh
+ fi
+
+ maybe_break casper-bottom
+ [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/casper-bottom"
+
+ pulsate
+ run_scripts /scripts/casper-bottom
+ [ "$quiet" != "y" ] && log_end_msg
+
+ if [ "${DEBUGCASPER}" != y ]; then
+ exec 1>&6 6>&-
+ exec 2>&7 7>&-
+ cp casper.log "${rootmnt}/var/log/"
+ fi
+}
diff -Naur casper-1.81/scripts/casper-helpers casper-1.81nfs/scripts/casper-helpers
--- casper-1.81/scripts/casper-helpers 2007-03-14 14:24:41.000000000 +0100
+++ casper-1.81nfs/scripts/casper-helpers 2007-03-14 14:26:39.000000000 +0100
@@ -173,6 +173,8 @@
find_cow_device() {
pers_label="${1}"
+ local mountpoint="${2}"
+
cow_backing="/${pers_label}-backing"
for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop); do
for dev in $(subdevices "${sysblock}"); do
@@ -192,6 +194,30 @@
fi
done
done
+
+ # try some paths from the same server we mounted root fs :
+ # - <rootServer>:<rootPathDir>/<hostname>
+ # - <rootServer>:<rootPathDir>
+ # with rootPathDir = parent directory of Casper's binary path
+ local rootPathDir=$(dirname ${NFSROOT})
+ local server=$(echo ${NFSROOT} | cut -d: -f1)
+ local host=$(cat /proc/sys/kernel/hostname)
+ local nfspath
+
+ if [ -z "${mountpoint}" ] || [ -z "${$NETBOOT}" ]; then return 1; fi
+
+ for nfspath in ${rootPathDir}/${host}/${pers_label} \
+ ${rootPathDir}/${pers_label} ; do
+ local path=$(echo ${nfspath} | cut -d: -f2)
+ [ "$quiet" != "y" ] && \
+ log_begin_msg "Trying to find cow device on net path ${nfspath}" >&2
+ if do_netmount "${nfspath}" "${mountpoint}" "-o rw"; then
+ echo "nfs"
+ return 0
+ fi
+ done
+
+ return 1
}
find_files()
@@ -220,3 +246,54 @@
}
+# Note : merge of do_netmount() [without net config], do_nfsmount()
+# and do_cifsmount()...
+do_netmount() {
+ local netroot=$1
+ local mountpoint=$2
+ local mountopts=$3
+
+ rc=1
+
+ # if NETBOOT is not set or not nfs, first try CIFS (Samba) :
+ if [ ! -z "${NETBOOT}" ] && [ "${NETBOOT}" != "nfs" ] && \
+ [ -x "/sbin/mount.cifs" ]; then
+ if [ -z "${NFSOPTS}" ]; then
+ CIFSOPTS="-ouser=root,password="
+ else
+ CIFSOPTS="${NFSOPTS}"
+ fi
+
+ _log_msg "Trying mount.cifs ${netroot} ${mountpoint} ${CIFSOPTS}..."
+ modprobe "${MP_QUIET}" cifs
+
+ if mount.cifs "${netroot}" "${mountpoint}" "${CIFSOPTS}"; then
+ rc=0
+ log_success_msg "Mounted ${netroot} as ${mountpoint}"
+ fi
+ fi
+ if [ ${rc} = 0 ]; then return ${rc}; fi
+
+ # try NFS if CIFS failed
+ modprobe "${MP_QUIET}" nfs
+### FIXME: ??? Do nothing, isn't it ???
+### if [ -z "${NFSOPTS}" ]; then
+### NFSOPTS=""
+### fi
+
+ _log_msg "Trying nfsmount -o nolock ${mountopts} ${NFSOPTS} ${netroot} ${mountpoint}"
+ # FIXME: This for loop is an ugly HACK round an nfs bug
+ # FIXMETOO: which one ?
+ for i in 0 1 2 3 4 5 6 7 8 9 a b c d e f 10 11 12 13; do
+ if nfsmount -o nolock ${mountopts} ${NFSOPTS} "${netroot}" "${mountpoint}"; then
+ rc=0
+ NETBOOT="nfs"
+ export NETBOOT
+ log_success_msg "Mounted ${netroot} as ${mountpoint}"
+ break
+ fi
+ sleep 1
+ done
+
+ return ${rc}
+}
diff -Naur casper-1.81/scripts/casper-helpers~ casper-1.81nfs/scripts/casper-helpers~
--- casper-1.81/scripts/casper-helpers~ 1970-01-01 01:00:00.000000000 +0100
+++ casper-1.81nfs/scripts/casper-helpers~ 2007-03-14 14:23:23.000000000 +0100
@@ -0,0 +1,272 @@
+## Casper helper functions, used by casper on boot and by casper-snapshot
+
+if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
+ MP_QUIET="-Q"
+else
+ MP_QUIET="-q"
+fi
+
+if [ ! -x "/bin/fstype" ]; then
+ # klibc not in path -> not in initramfs
+ export PATH="${PATH}:/usr/lib/klibc/bin"
+fi
+
+sys2dev() {
+ sysdev=${1#/sys}
+ echo "/dev/$(udevinfo -q name -p ${sysdev} 2>/dev/null|| echo ${sysdev##*/})"
+}
+
+subdevices() {
+ sysblock=$1
+ r=""
+ for dev in "${sysblock}" "${sysblock}"/*; do
+ if [ -e "${dev}/dev" ]; then
+ r="${r} ${dev}"
+ fi
+ done
+ echo ${r}
+}
+
+get_fstype() {
+ local FSTYPE
+ local FSSIZE
+ eval $(fstype < $1)
+ if [ "$FSTYPE" != "unknown" ]; then
+ echo $FSTYPE
+ return 0
+ fi
+ /lib/udev/vol_id -t $1 2>/dev/null
+}
+
+where_is_mounted() {
+ device=$1
+ if grep -q "^$device " /proc/mounts; then
+ grep "^$device " /proc/mounts | read d mountpoint rest
+ echo $mountpoint
+ return 0
+ fi
+ return 1
+}
+
+lastline() {
+ while read lines ; do
+ line=${lines}
+ done
+ echo "${line}"
+}
+
+base_path ()
+{
+ testpath="${1}"
+ mounts="$(awk '{print $2}' /proc/mounts)"
+ testpath="$(busybox realpath ${testpath})"
+
+ while true ; do
+ if echo "${mounts}" | grep -qs "^${testpath}" ; then
+ set -- `echo "${mounts}" | grep "^${testpath}" | lastline`
+ echo ${1}
+ break
+ else
+ testpath=`dirname $testpath`
+ fi
+ done
+}
+
+fs_size ()
+{
+ # Returns used/free fs kbytes + 5% more
+ # You could pass a block device as $1 or the mount point as $2
+
+ dev="${1}"
+ mountp="${2}"
+ used="${3}"
+
+ if [ -z "${mountp}" ]; then
+ mountp=$(where_is_mounted "${dev}")
+ if [ "$?" -gt 0 ]; then
+ mountp="/mnt/tmp_fs_size"
+ mkdir -p "${mountp}"
+ mount -t $(get_fstype "${dev}") -o ro "${dev}" "${mountp}"
+ doumount=1
+ fi
+ fi
+
+ if [ "${used}" = "used" ]; then
+ size=$(du -ks ${mountp} | cut -f1)
+ size=$(expr ${size} + ${size} / 20 ) # FIXME: 5% more to be sure
+ else
+ # free space
+ size="$(df -k | grep -s ${mountp} | awk '{print $4}')"
+ fi
+
+ if [ -n "${doumount}" ]; then
+ umount "${mountp}"
+ rmdir "${mountp}"
+ fi
+ echo "${size}"
+}
+
+setup_loop() {
+ local fspath=$1
+ local module=$2
+ local pattern=$3
+ local offset=$4
+
+ modprobe "${MP_QUIET}" -b "$module"
+ udevsettle
+
+ for loopdev in $pattern; do
+ if [ "$(cat $loopdev/size)" -eq 0 ]; then
+ dev=$(sys2dev "${loopdev}")
+ if [ -n "$offset" ]; then
+ losetup -o "$offset" "$dev" "$fspath"
+ else
+ losetup "$dev" "$fspath"
+ fi
+ echo "$dev"
+ return 0
+ fi
+ done
+ panic "No loop devices available"
+}
+
+try_mount ()
+{
+ dev="${1}"
+ mountp="${2}"
+ opts="${3}"
+
+ if where_is_mounted ${dev} > /dev/null; then
+ mount -o remount,"${opts}" ${dev} $(where_is_mounted ${dev}) || panic "Remounting failed"
+ mount -o bind $(where_is_mounted ${dev}) ${mountp} || panic "Cannot bind-mount"
+ else
+ mount -t $(get_fstype "${dev}") -o "${opts}" "${dev}" "${mountp}" || panic "Cannot mount ${dev} on ${mountp}"
+ fi
+}
+
+find_cow_device() {
+ pers_label="${1}"
+ local mountpoint="${2}"
+
+ cow_backing="/${pers_label}-backing"
+ for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop); do
+ for dev in $(subdevices "${sysblock}"); do
+ devname=$(sys2dev "${dev}")
+ if [ "$(/lib/udev/vol_id -l $devname 2>/dev/null)" = "${pers_label}" ]; then
+ echo "$devname"
+ return
+ elif [ "$(get_fstype ${devname})" = "vfat" ]; then # FIXME: all supported block devices should be scanned
+ mkdir -p "${cow_backing}"
+ try_mount "${devname}" "${cow_backing}" "rw"
+ if [ -e "${cow_backing}/${pers_label}" ]; then
+ echo $(setup_loop "${cow_backing}/${pers_label}" "loop" "/sys/block/loop*")
+ return 0
+ else
+ umount ${cow_backing}
+ fi
+ fi
+ done
+ done
+
+ # try some paths from the same server we mounted root fs :
+ # - <rootServer>:<rootPathDir>/<hostname>
+ # - <rootServer>:<rootPathDir>
+ # with rootPathDir = parent directory of Casper's binary path
+ local rootPathDir=$(dirname ${NFSROOT})
+ local server=$(echo ${NFSROOT} | cut -d: -f1)
+ local host=$(cat /proc/sys/kernel/hostname)
+ local nfspath
+
+ if [ -z "${mountpoint}" ] || [ -z "${$NETBOOT}" ]; then return 1; fi
+
+ for nfspath in ${rootPathDir}/${host}/${pers_label} \
+ ${rootPathDir}/${pers_label} ; do
+ local path=$(echo ${nfspath} | cut -d: -f2)
+ [ "$quiet" != "y" ] && \
+ log_begin_msg "Trying to find cow device on net path ${nfspath}" >&2
+ if do_netmount "${nfspath}" "${mountpoint}" "-o rw"; then
+ echo "nfs"
+ return 0
+ fi
+ done
+
+ return 1
+}
+
+find_files()
+# return the first of $filenames found on vfat and ext2 devices
+# FIXME: merge with above function
+{
+ filenames="${1}"
+ snap_backing="/snap-backing"
+ for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop); do
+ for dev in $(subdevices "${sysblock}"); do
+ devname=$(sys2dev "${dev}")
+ devfstype="$(get_fstype ${devname})"
+ if [ "${devfstype}" = "vfat" ] || [ "${devfstype}" = "ext2" ] ; then # FIXME: all supported block devices should be scanned
+ mkdir -p "${snap_backing}"
+ try_mount "${devname}" "${snap_backing}" "ro"
+ for filename in ${filenames}; do
+ if [ -e "${snap_backing}/${filename}" ]; then
+ echo "${devname} ${snap_backing} ${filename}"
+ return 0
+ fi
+ done
+ umount ${snap_backing}
+ fi
+ done
+ done
+}
+
+
+# Note : merge of do_netmount() [without net config], do_nfsmount()
+# and do_cifsmount()...
+do_netmount() {
+ local netroot=$1
+ local mountpoint=$2
+ local mountopts=$3
+
+ rc=1
+
+ # if NETBOOT is not set or not nfs, first try CIFS (Samba) :
+ if [ ! -z "${NETBOOT}" ] && [ "${NETBOOT}" != "nfs" ] && \
+ [ -x "/sbin/mount.cifs" ]; then
+ if [ -z "${NFSOPTS}" ]; then
+ CIFSOPTS="-ouser=root,password="
+ else
+ CIFSOPTS="${NFSOPTS}"
+ fi
+
+ _log_msg "Trying mount.cifs ${netroot} ${mountpoint} ${CIFSOPTS}..."
+ modprobe "${MP_QUIET}" cifs
+
+ if mount.cifs "${netroot}" "${mountpoint}" "${CIFSOPTS}"; then
+ rc=0
+ log_success_msg "Mounted ${netroot} as ${mountpoint}"
+ fi
+ fi
+ if [ ${rc} = 0 ]; then return ${rc}; fi
+
+ # try NFS if CIFS failed
+ modprobe "${MP_QUIET}" nfs
+### FIXME: ??? Do nothing, isn't it ???
+### if [ -z "${NFSOPTS}" ]; then
+### NFSOPTS=""
+### fi
+
+ _log_msg "Trying nfsmount -o nolock ${mountopts} ${NFSOPTS} ${netroot} ${mountpoint}"
+ # FIXME: This for loop is an ugly HACK round an nfs bug
+ # FIXMETOO: which one ?
+ for i in 0 1 2 3 4 5 6 7 8 9 a b c d e f 10 11 12 13; do
+ if nfsmount -o nolock ${mountopts} ${NFSOPTS} "${netroot}" "${mountpoint}"; then
+ rc=0
+ NETBOOT="nfs"
+ export NETBOOT
+ log_success_msg "Mounted ${netroot} as ${mountpoint}"
+ break
+ fi
+ sleep 1
+ done
+
+ return ${rc}
+}
_______________________________________________
Debian-live-devel mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-live-devel
