[SCM] live-boot branch, debian-next, updated. debian/2.0_a11-1-2-g907dd23

[Marco Amadori]

The following commit has been merged in the debian-next branch:
commit 907dd231cf64a6aec12fd28028e017dc258b5b71
Author: Marco Amadori <amadorim at vdavda.com>
Date:   Mon Jul 5 17:07:10 2010 +0200

    Avoid using busybox cpio applet.
    
    * It should fix snapshot restore.
    
    Signed-off-by: Marco Amadori <amadorim at vdavda.com>

diff --git a/scripts/live b/scripts/live
index 5b5a3b9..d35fb08 100755
--- a/scripts/live
+++ b/scripts/live
@@ -992,9 +992,9 @@ try_snap ()
 				cpioargs='--unconditional --make-directories'
 			fi
 
-			if ! (cd "${snap_mount}" && zcat "${snapback}/${snapfile}" | cpio $cpioargs --extract --preserve-modification-time --no-absolute-filenames --sparse 2>/dev/null)
+			if ! (cd "${snap_mount}" && zcat "${snapback}/${snapfile}" | $cpiopath $cpioargs --extract --preserve-modification-time --no-absolute-filenames --sparse 2>/dev/null)
 			then
-				log_warning_msg "failure to \"zcat ${snapback}/${snapfile} | cpio $cpioargs --extract --preserve-modification-time --no-absolute-filenames --sparse\""
+				log_warning_msg "failure to \"zcat ${snapback}/${snapfile} | $cpiopath $cpioargs --extract --preserve-modification-time --no-absolute-filenames --sparse\""
 			fi
 		fi
 

-- 
live-boot