[pisa-src] r2495 - in trunk/tools/live-cds/patches: . casper.patch

From: Samuel Richter <samuel.richter@xxxxxxxxxxxxxx>
To: pisa-src@xxxxxxxxxxxxx
Date: Sun, 03 Apr 2011 19:12:10 +0200
Author: richter
Date: Sun Apr  3 19:12:10 2011
New Revision: 2495

Log:
add patch to live-cds, to allow non-root virtual testbed creation.

- make the function to find a snapshot-file read from iso9660 filesystems.

- make the function to extract cpio snapshots not use the which command,
  which isn't available in current ubuntu initrd.

Added:
   trunk/tools/live-cds/patches/
   trunk/tools/live-cds/patches/casper.patch

Added: trunk/tools/live-cds/patches/casper.patch
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ trunk/tools/live-cds/patches/casper.patch   Sun Apr  3 19:12:10 2011        
(r2495)
@@ -0,0 +1,24 @@
+diff -r -u /usr/share/initramfs-tools/scripts/casper scripts/casper
+--- /usr/share/initramfs-tools/scripts/casper  2010-09-15 23:34:18.000000000 
+0000
++++ /usr/share/initramfs-tools/scripts/casper  2011-04-02 17:07:49.234629980 
+0000
+@@ -320,7 +320,7 @@
+             # Unfortunately klibc's cpio is incompatible with the rest of
+             # the world; everything else requires -u -d, while klibc doesn't
+             # implement them. Try to detect whether it's in use.
+-            cpiopath="$(which cpio)" || true
++            cpiopath="/bin/cpio"
+             if [ "$cpiopath" ] && grep -aq /lib/klibc "$cpiopath"; then
+                 cpioargs=
+             else
+diff -r -u /usr/share/initramfs-tools/scripts/casper-helpers 
scripts/casper-helpers
+--- /usr/share/initramfs-tools/scripts/casper-helpers  2010-09-15 
23:34:18.000000000 +0000
++++ /usr/share/initramfs-tools/scripts/casper-helpers  2011-04-02 
17:07:50.844630004 +0000
+@@ -224,7 +224,7 @@
+         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
++            if [ "${devfstype}" = "vfat" ] || [ "${devfstype}" = "ext2" ] || 
[ "${devfstype}" = "iso9660" ] ; then # FIXME: all supported block devices 
should be scanned
+                 mkdir -p "${snap_backing}"
+                 try_mount "${devname}" "${snap_backing}" "ro"
+                 for filename in ${filenames}; do
-- 
This is the pisa developer mailing list. Please also subscribe to the main pisa 
list at:
//www.freelists.org/list/pisa
[pisa-src] r2495 - in trunk/tools/live-cds/patches: . casper.patch

Other related posts:
