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/bootstrap_debootstrap | |
| 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/bootstrap_debootstrap')
| -rwxr-xr-x | scripts/build/bootstrap_debootstrap | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap index 697a093bb..f0262aa8c 100755 --- a/scripts/build/bootstrap_debootstrap +++ b/scripts/build/bootstrap_debootstrap @@ -37,8 +37,10 @@ Echo_message "Begin bootstrapping system..." Check_package chroot bin/debootstrap debootstrap # Checking stage file -Check_stagefile .build/bootstrap -Check_stagefile .build/bootstrap_cache.restore +Check_stagefile bootstrap +# Note, this must match that used in `bootstrap_cache` +STAGE_FILE="bootstrap_cache.restore" +Check_stagefile "${STAGE_FILE}" # Acquire lock file Acquire_lockfile @@ -118,4 +120,4 @@ rm -f chroot/etc/hosts rm -f chroot/var/cache/apt/archives/*.deb # Creating stage file -Create_stagefile .build/bootstrap +Create_stagefile bootstrap |