summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2011-09-07 14:16:05 +0200
committerDaniel Baumann <daniel@debian.org>2011-09-07 14:16:05 +0200
commitdfaa4a67b55613087cd7beb80fb386a85f1c84f8 (patch)
tree5101bec827e151995a2b65fc1a267e33f1cb871e
parentef53525970f0d3d9410e8a356fc9170cbead016a (diff)
downloadvyos-live-build-dfaa4a67b55613087cd7beb80fb386a85f1c84f8.tar.gz
vyos-live-build-dfaa4a67b55613087cd7beb80fb386a85f1c84f8.zip
Doing uuid.conf extraction from initrd with the correct decompression utility (Closes: #637979).
-rwxr-xr-xscripts/build/lb_binary_disk14
1 files changed, 13 insertions, 1 deletions
diff --git a/scripts/build/lb_binary_disk b/scripts/build/lb_binary_disk
index a7ddef25d..1dc8d82db 100755
--- a/scripts/build/lb_binary_disk
+++ b/scripts/build/lb_binary_disk
@@ -91,7 +91,19 @@ case "${LB_INITRAMFS}" in
mkdir -p binary/uuid
cd binary/uuid
- zcat "../../${INITRD}" | cpio --quiet -id conf/uuid.conf
+ case "${LB_INITRAMFS_COMPRESSION}" in
+ gzip)
+ zcat "../../${INITRD}" | cpio --quiet -id conf/uuid.conf
+ ;;
+
+ bzip2)
+ bzcat "../../${INITRD}" | cpio --quiet -id conf/uuid.conf
+ ;;
+
+ lzma)
+ lzcat "../../${INITRD}" | cpio --quiet -id conf/uuid.conf
+ ;;
+ esac
if [ -e conf/uuid.conf ]
then