From 42f2e223d81dccf0fa2ca02fa917b5adfa7930cd Mon Sep 17 00:00:00 2001 From: Ben Wilson Date: Fri, 1 Mar 2024 14:27:10 +0000 Subject: [PATCH 1/3] Simple-CDD: fix typo --- simple-cdd/simple-cdd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simple-cdd/simple-cdd.conf b/simple-cdd/simple-cdd.conf index 6277715..c27c68b 100644 --- a/simple-cdd/simple-cdd.conf +++ b/simple-cdd/simple-cdd.conf @@ -94,7 +94,7 @@ export DISC_END_HOOK=$(pwd)/disc-end-hook # Extra files to include onto the CD # These will get copied to /simple-cdd dir on the CD # Paths starting with '/' are interpreted as absolute, otherwise relative -# to the currect directory. +# to the current directory. #all_extras="" # Generate a simple package repository on the CD with the debs cited From 0a814e13a7a46efd880bd619cfbf4a6b8814f157 Mon Sep 17 00:00:00 2001 From: Ben Wilson Date: Fri, 1 Mar 2024 14:27:31 +0000 Subject: [PATCH 2/3] Simple-CDD: consistency with other settings --- simple-cdd/simple-cdd.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/simple-cdd/simple-cdd.conf b/simple-cdd/simple-cdd.conf index c27c68b..d1c14d9 100644 --- a/simple-cdd/simple-cdd.conf +++ b/simple-cdd/simple-cdd.conf @@ -29,7 +29,7 @@ profiles=${profiles:-kali} auto_profiles=${auto_profiles:-kali} # To include profiles which only effect the CD build -# build_profiles="kali" +#build_profiles="kali" # Mirror tools mirror_tools="reprepro download" @@ -42,7 +42,7 @@ server="http.kali.org" debian_mirror=${debian_mirror:-http://archive.kali.org/kali/} keyring="/usr/share/keyrings/kali-archive-keyring.gpg" -# which components to get from the mirror +# Which components to get from the mirror mirror_components="main contrib non-free non-free-firmware" # Disable *-security and *-updates repositories From ae9b552efd4f4b23348398508d2e9f01b42a06a2 Mon Sep 17 00:00:00 2001 From: Ben Wilson Date: Fri, 1 Mar 2024 14:27:48 +0000 Subject: [PATCH 3/3] Misc formatting --- build.sh | 1 - simple-cdd/simple-cdd.conf | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index 0bcbf66..5a5f5ad 100755 --- a/build.sh +++ b/build.sh @@ -410,4 +410,3 @@ run_and_log mv -f $IMAGE_NAME $TARGET_DIR/$(target_image_name $KALI_ARCH) run_and_log mv -f "$BUILD_LOG" $TARGET_DIR/$(target_build_log $KALI_ARCH) run_and_log echo -e "\n***\nGENERATED KALI IMAGE: $TARGET_DIR/$(target_image_name $KALI_ARCH)\n***" - diff --git a/simple-cdd/simple-cdd.conf b/simple-cdd/simple-cdd.conf index d1c14d9..e8bce42 100644 --- a/simple-cdd/simple-cdd.conf +++ b/simple-cdd/simple-cdd.conf @@ -1,10 +1,10 @@ # simple-cdd.conf detailed configuration file - +# # Note: this is an example list of configuration options: it is *strongly* # advised to merely create a new file using only the options you actually need. - +# # Note: Variables in lowercase are only used by simple-cdd. - +# # Profile Selection # # The following four files get included on the CD if present: