From 4b6aa7a76de756e3e538bf4dccf980ddad183310 Mon Sep 17 00:00:00 2001 From: Ben Wilson Date: Thu, 13 May 2021 16:15:41 +0100 Subject: [PATCH] Symlink to live file, rather than copying (we do it with preseed anyway) --- .gitignore | 4 +--- build.sh | 12 ++---------- .../kali-finish-install | 0 simple-cdd/profiles/kali.postinst | 1 + 4 files changed, 4 insertions(+), 13 deletions(-) rename kali-config/common/{post-install => includes.installer}/kali-finish-install (100%) create mode 120000 simple-cdd/profiles/kali.postinst diff --git a/.gitignore b/.gitignore index e34f87e..44c5d8b 100644 --- a/.gitignore +++ b/.gitignore @@ -23,11 +23,9 @@ live-image-*.contents live-image-*.files live-image-*.hybrid.iso.zsync live-image-*.packages -# Rverwritten due to build.sh -kali-config/common/includes.installer/kali-finish-install +# Overwritten due to build.sh simple-cdd/debian-cd/* simple-cdd/profiles/kali.downloads -simple-cdd/profiles/kali.postinst # Miscellaneous .lock .stage diff --git a/build.sh b/build.sh index 4fd7e93..ae1e1a8 100755 --- a/build.sh +++ b/build.sh @@ -280,15 +280,11 @@ set +e case "$IMAGE_TYPE" in live) - debug "Stage 1/3 - File(s)" - run_and_log cp kali-config/common/post-install/kali-finish-install kali-config/common/includes.installer/ - [ $? -eq 0 ] || failure - - debug "Stage 2/3 - Config" + debug "Stage 1/2 - Config" run_and_log lb config -a $KALI_ARCH $KALI_CONFIG_OPTS "$@" [ $? -eq 0 ] || failure - debug "Stage 3/3 - Build" + debug "Stage 2/2 - Build" run_and_log $SUDO lb build if [ $? -ne 0 ] || [ ! -e $IMAGE_NAME ]; then failure @@ -333,10 +329,6 @@ case "$IMAGE_TYPE" in simple-cdd/debian-cd/data/$CODENAME/exclude-udebs-i386 [ $? -eq 0 ] || failure - # Update the post-install script - run_and_log cp kali-config/common/post-install/kali-finish-install simple-cdd/profiles/kali.postinst - [ $? -eq 0 ] || failure - # Configure the kali profile with the packages we want run_and_log grep -v '^#' kali-config/installer-$KALI_VARIANT/packages \ > simple-cdd/profiles/kali.downloads diff --git a/kali-config/common/post-install/kali-finish-install b/kali-config/common/includes.installer/kali-finish-install similarity index 100% rename from kali-config/common/post-install/kali-finish-install rename to kali-config/common/includes.installer/kali-finish-install diff --git a/simple-cdd/profiles/kali.postinst b/simple-cdd/profiles/kali.postinst new file mode 120000 index 0000000..a0e67f7 --- /dev/null +++ b/simple-cdd/profiles/kali.postinst @@ -0,0 +1 @@ +../../kali-config/common/includes.installer/kali-finish-install \ No newline at end of file