X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fcasper;h=6f7bbb022c95f2688bae104766675193063b72fc;hb=refs%2Ftags%2Fdebian%2F1.71%2Bdebian-1;hp=3e4ed06679469f94470464e21303dbb1f0ae4338;hpb=6c1a2cfab139bb4a61e7bcf5f4cafe3b7498f64e;p=live-boot-grml.git diff --git a/scripts/casper b/scripts/casper index 3e4ed06..6f7bbb0 100644 --- a/scripts/casper +++ b/scripts/casper @@ -6,20 +6,9 @@ export PATH=/root/usr/bin:/root/usr/sbin:/root/bin:/root/sbin:/usr/bin:/usr/sbin mountpoint=/live_media -# Will be mounted if found as copy on write instead of tmpfs root_persistence="casper-rw" - -# TODO -## Each file found with this pattern will be mounted directly in the -## mountpoint extracted from file name "${other_mounts_pattern}" -#other_mounts_pattern="casper-mount-" home_persistence="home-rw" -#overlay_method=unionfs -#if [ "${DPKG_ARCH}" = "ia64" ] || [ "${DPKG_ARCH}" = "hppa" ] || [ "${DPKG_ARCH}" = "sparc" ]; then -# overlay_method=devmapper -#fi - USERNAME="casper" USERFULLNAME="Live session user" HOST="live" @@ -40,14 +29,32 @@ fi # 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" + ;; + host*) + export HOST=${x#host=} + export CASPERCONF="changed" + ;; + username*) + export USERNAME=${x#username=} + export CASPERCONF="changed" + ;; netboot*) export NETBOOT=${x#netboot=} ;; toram) export TORAM=1 ;; - show-cow) - export SHOWCOW=1 ;; + showmounts) + export SHOWMOUNTS=1 ;; persistent) export PERSISTENT=1 ;; + ip*) + STATICIP=${x#ip=} + if [ "${STATICIP}" == "" ]; then + STATICIP="frommedia" + fi + export STATICIP ;; casper-getty) export CASPERGETTY=1 ;; esac @@ -155,8 +162,6 @@ setup_loop() { } get_fstype() { - #FIXME# one use of this function expects "unknown" another does not! - # which is it??? local FSTYPE local FSSIZE eval $(fstype < $1) @@ -223,7 +228,7 @@ copy_to_ram() { size=$(expr ${size} + ${size}/20 ) # Fixme: 5% more to be sure needed_space=$(expr ${size} * 1024) freespace=$( expr $(awk '/MemFree/{print $2}' /proc/meminfo) + $( cat /proc/meminfo | grep Cached | head -n 1 | awk '/Cached/{print $2}' - )) - + if [ ! ${freespace} -lt ${needed_space} ] ; then [ "$quiet" != "y" ] && log_begin_msg "Not enough free memory to copy to ram" [ "$quiet" != "y" ] && log_end_msg @@ -283,7 +288,7 @@ do_netmount() { fi [ "$quiet" != "y" ] && log_begin_msg "Trying netboot from ${NFSROOT}" - + if [ "${NETBOOT}" != "nfs" ] && do_cifsmount ; then rc=0 elif do_nfsmount ; then @@ -337,9 +342,12 @@ setup_unionfs() { modprobe "${MP_QUIET}" -b unionfs - # run-init can't deal with this, but we're going to move all of these - # away before it runs anyway. - croot="/casper" + # 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="" @@ -374,7 +382,7 @@ setup_unionfs() { mkdir -p /cow cowdevice="tmpfs" cow_fstype="tmpfs" - + # Looking for "${root_persistence}" device or file if [ ! -z "${PERSISTENT}" ]; then cowprobe=$(find_cow_device "${root_persistence}") @@ -382,21 +390,15 @@ setup_unionfs() { cowdevice=${cowprobe} cow_fstype=$(get_fstype "${cowprobe}") else - [ "$quiet" != "y" ] && log_begin_msg "Unable to find the persistent medium" + [ "$quiet" != "y" ] && log_begin_msg "Unable to find the persistent medium" fi fi mount ${cowdevice} -t ${cow_fstype} -o rw /cow || panic "Can not mount $cowdevice on /cow" - + mount -t unionfs -o dirs=/cow=rw:$rofsstring unionfs "$rootmnt" || panic "Unionfs mount failed" - - for d in ${rofslist}; do - mkdir -p "${rootmnt}/casper/${d##*/}" - case d in - *.dir) mount -o bind "${d}" "${rootmnt}/casper/${d##*/}" ;; - *) mount -o move "${d}" "${rootmnt}/casper/${d##*/}" ;; - esac - done + + # Look for a snapshot to copy # Adding other custom mounts if [ ! -z "${PERSISTENT}" ]; then @@ -408,15 +410,26 @@ setup_unionfs() { fi fi - if [ ! -z "${SHOWCOW}" ]; then - mkdir -p "$rootmnt/cow" - mount -o bind /cow "$rootmnt/cow" + if [ ! -z "${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" } is_usb_device() { sysfs_path="${1#/sys}" - if /lib/udev/path_id "${sysfs_path}" | grep -Eq "ID_PATH=(usb|pci-[^-]*-usb)"; then + if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-[^-]*-usb)"; then return 0 fi return 1 @@ -453,11 +466,11 @@ find_livefs() { done elif [ "${fstype}" = "squashfs" || \ "${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 @@ -465,6 +478,12 @@ find_livefs() { done } +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" @@ -476,9 +495,10 @@ mountroot() { exec 7>&2 exec > casper.log exec 2>&1 - + set_usplash_timeout [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/casper-premount" + pulsate run_scripts /scripts/casper-premount [ "$quiet" != "y" ] && log_end_msg @@ -505,7 +525,7 @@ mountroot() { if [ "$?" -gt 0 ]; then panic "Unable to find a medium containing a live file system" fi - + if [ ! -z "${TORAM}" ]; then copy_to_ram "${livefs_root}" fi @@ -519,6 +539,7 @@ mountroot() { maybe_break casper-bottom [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/casper-bottom" + pulsate run_scripts /scripts/casper-bottom [ "$quiet" != "y" ] && log_end_msg