[Debian-live-changes] r1304 - in dists/trunk/live-initramfs: bin
doc hooks scripts scripts/casper-premount
Daniel Baumann
daniel at alioth.debian.org
Sun May 6 10:32:49 UTC 2007
Author: daniel
Date: 2007-05-06 10:32:49 +0000 (Sun, 06 May 2007)
New Revision: 1304
Added:
dists/trunk/live-initramfs/scripts/live-helpers
Removed:
dists/trunk/live-initramfs/scripts/casper-helpers
Modified:
dists/trunk/live-initramfs/bin/live-snapshot
dists/trunk/live-initramfs/doc/ChangeLog
dists/trunk/live-initramfs/hooks/casper
dists/trunk/live-initramfs/scripts/casper-premount/10driver_updates
Log:
Modified: dists/trunk/live-initramfs/bin/live-snapshot
===================================================================
--- dists/trunk/live-initramfs/bin/live-snapshot 2007-05-06 10:30:27 UTC (rev 1303)
+++ dists/trunk/live-initramfs/bin/live-snapshot 2007-05-06 10:32:49 UTC (rev 1304)
@@ -41,7 +41,7 @@
export USERNAME USERFULLNAME HOSTNAME BUILD_SYSTEM
# Source helper functions
-helpers="/usr/share/initramfs-tools/scripts/casper-helpers"
+helpers="/usr/share/initramfs-tools/scripts/live-helpers"
if [ -e "${helpers}" ]; then
. "${helpers}"
else
Modified: dists/trunk/live-initramfs/doc/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/doc/ChangeLog 2007-05-06 10:30:27 UTC (rev 1303)
+++ dists/trunk/live-initramfs/doc/ChangeLog 2007-05-06 10:32:49 UTC (rev 1304)
@@ -7,8 +7,8 @@
- Renamed to live-md5check.
* casper.conf:
- Renamed to live.conf.
- * scripts/casper-functions:
- - Renamed to live-functions.
+ * scripts/casper-functions, casper-helpers:
+ - Renamed to live-*.
* bin/live-getty, live-login:
- Reformated.
Modified: dists/trunk/live-initramfs/hooks/casper
===================================================================
--- dists/trunk/live-initramfs/hooks/casper 2007-05-06 10:30:27 UTC (rev 1303)
+++ dists/trunk/live-initramfs/hooks/casper 2007-05-06 10:32:49 UTC (rev 1304)
@@ -65,7 +65,7 @@
copy_exec /usr/lib/casper/live-md5check /bin
cp /usr/share/initramfs-tools/scripts/live-functions $DESTDIR/scripts
-cp /usr/share/initramfs-tools/scripts/casper-helpers $DESTDIR/scripts
+cp /usr/share/initramfs-tools/scripts/live-helpers $DESTDIR/scripts
auto_add_modules net
Deleted: dists/trunk/live-initramfs/scripts/casper-helpers
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-helpers 2007-05-06 10:30:27 UTC (rev 1303)
+++ dists/trunk/live-initramfs/scripts/casper-helpers 2007-05-06 10:32:49 UTC (rev 1304)
@@ -1,197 +0,0 @@
-## Casper helper functions, used by casper on boot and by casper-snapshot
-
-if [ "${BUILD_SYSTEM}" = "Ubuntu" ]; then
- MP_QUIET="-Q"
-elif [ "${BUILD_SYSTEM}" = "Debian" ]; then
- MP_QUIET="-q"
-else
- MP_QUIET=""
-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}"
- 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
-}
-
-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
-}
-
-
Modified: dists/trunk/live-initramfs/scripts/casper-premount/10driver_updates
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-premount/10driver_updates 2007-05-06 10:30:27 UTC (rev 1303)
+++ dists/trunk/live-initramfs/scripts/casper-premount/10driver_updates 2007-05-06 10:32:49 UTC (rev 1304)
@@ -2,7 +2,7 @@
PREREQ=""
. /scripts/live-functions
-. /scripts/casper-helpers
+. /scripts/live-helpers
prereqs()
{
Copied: dists/trunk/live-initramfs/scripts/live-helpers (from rev 1302, dists/trunk/live-initramfs/scripts/casper-helpers)
More information about the Debian-live-changes
mailing list