diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-12 01:21:39 +0000 |
|---|---|---|
| committer | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-17 18:57:02 +0000 |
| commit | 04d9ee0211e7cf2d5f637941ff6579b4f5462da6 (patch) | |
| tree | 17d1ccea5c085c5afd62361d2fe97a14c951cb9b /scripts/build/binary_rootfs | |
| parent | bea349c82237ee165baaf1f7e8043a26e0c14417 (diff) | |
| download | vyos-live-build-04d9ee0211e7cf2d5f637941ff6579b4f5462da6.tar.gz vyos-live-build-04d9ee0211e7cf2d5f637941ff6579b4f5462da6.zip | |
stagefiles: simplify & robustify
- avoid all need to pass ".build/" path in stage file names into the
functions
- add a helper to remove a stage file (required to complete the above
properly)
- avoid duplicating filenames within scripts which makes them prone to
mistakes (some instances of which I've actually encountered and had
to fix)
Gbp-Dch: Short
Diffstat (limited to 'scripts/build/binary_rootfs')
| -rwxr-xr-x | scripts/build/binary_rootfs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs index 806cf8613..99c962362 100755 --- a/scripts/build/binary_rootfs +++ b/scripts/build/binary_rootfs @@ -24,10 +24,11 @@ Init_config_data "${@}" Echo_message "Begin building root filesystem image..." # Requiring stage file -Require_stagefile .build/config .build/bootstrap .build/binary_chroot +Require_stagefile config bootstrap binary_chroot # Checking stage file -Check_stagefile .build/binary_rootfs +STAGE_FILE="binary_rootfs" +Check_stagefile "${STAGE_FILE}" # Acquire lock file Acquire_lockfile @@ -65,7 +66,7 @@ then cp -a cache/binary_rootfs/filesystem.* binary/"${INITFS}" # Creating stage file - Create_stagefile .build/binary_rootfs + Create_stagefile "${STAGE_FILE}" exit 0 fi @@ -447,4 +448,4 @@ then fi # Creating stage file -Create_stagefile .build/binary_rootfs +Create_stagefile "${STAGE_FILE}" |