[SCM] live-boot branch, debian, updated. debian/2.0_a11-1-7-ge2ba97a
Daniel Baumann
daniel at debian.org
Wed Jul 7 18:16:23 UTC 2010
The following commit has been merged in the debian branch:
commit b1e77d7bb3bf329a929296afc8f285e178f65370
Author: Marco Amadori <amadorim at vdavda.com>
Date: Mon Jul 5 17:07:10 2010 +0200
Avoiding using busybox cpio applet, this should fix snapshot restore.
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
More information about the debian-live-changes
mailing list