summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2008-10-14 16:12:09 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:42 +0100
commit0cbbde2b9664b9fafb311f1048db25ea69952222 (patch)
tree97d946f855830634f9468efdb4dffc211e4c9371
parentd92d4e2201d921510fa2e7247ef1184b55680ee3 (diff)
downloadvyos-live-build-0cbbde2b9664b9fafb311f1048db25ea69952222.tar.gz
vyos-live-build-0cbbde2b9664b9fafb311f1048db25ea69952222.zip
Using simplified Require_stagefile(); calls by passing multiple arguments.
-rwxr-xr-xhelpers/lh_binary_encryption3
-rwxr-xr-xhelpers/lh_binary_rootfs3
-rwxr-xr-xhelpers/lh_binary_usb-hdd3
3 files changed, 3 insertions, 6 deletions
diff --git a/helpers/lh_binary_encryption b/helpers/lh_binary_encryption
index 79c4791dc..480c382f1 100755
--- a/helpers/lh_binary_encryption
+++ b/helpers/lh_binary_encryption
@@ -53,8 +53,7 @@ esac
Echo_message "Begin encrypting root filesystem image..."
# Requiring stage file
-Require_stagefile .stage/bootstrap
-Require_stagefile .stage/binary_rootfs
+Require_stagefile .stage/bootstrap .stage/binary_rootfs
# Checking stage file
Check_stagefile .stage/binary_encryption
diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index 450753aa6..e48b0722e 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -31,8 +31,7 @@ Set_defaults
Echo_message "Begin building root filesystem image..."
# Requiring stage file
-Require_stagefile .stage/bootstrap
-Require_stagefile .stage/binary_chroot
+Require_stagefile .stage/bootstrap .stage/binary_chroot
# Checking stage file
Check_stagefile .stage/binary_rootfs
diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd
index 1ea80ae87..315cf7956 100755
--- a/helpers/lh_binary_usb-hdd
+++ b/helpers/lh_binary_usb-hdd
@@ -36,8 +36,7 @@ fi
Echo_message "Begin building binary usb-hdd image..."
# Requiring stage file
-Require_stagefile .stage/bootstrap
-Require_stagefile .stage/chroot_proc
+Require_stagefile .stage/bootstrap .stage/chroot_proc
# Checking stage file
Check_stagefile .stage/binary_usb-hdd