From c00a132d10ce597d694da3c82eb82872583f8b3e Mon Sep 17 00:00:00 2001 From: Ben Wilson Date: Thu, 13 May 2021 15:17:13 +0100 Subject: [PATCH] Remove trailing spaces --- kali-config/common/bootloaders/grub-pc/grub.cfg | 2 +- .../common/hooks/live/forensic-menu.binary | 1 - .../common/includes.installer/preseed.cfg | 4 ++-- kali-config/installer-default/packages | 2 +- simple-cdd/simple-cdd.conf | 17 ++++++++--------- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/kali-config/common/bootloaders/grub-pc/grub.cfg b/kali-config/common/bootloaders/grub-pc/grub.cfg index 92eea9b..0941fa7 100644 --- a/kali-config/common/bootloaders/grub-pc/grub.cfg +++ b/kali-config/common/bootloaders/grub-pc/grub.cfg @@ -21,7 +21,7 @@ LINUX_INSTALL if [ ! -e /boot/grub/install.cfg ]; then menuentry "Start installer with speech synthesis" { - linux KERNEL_GI speakup.synth=soft APPEND_GI + linux KERNEL_GI speakup.synth=soft APPEND_GI initrd INITRD_GI } fi diff --git a/kali-config/common/hooks/live/forensic-menu.binary b/kali-config/common/hooks/live/forensic-menu.binary index 44caff8..2acc04b 100755 --- a/kali-config/common/hooks/live/forensic-menu.binary +++ b/kali-config/common/hooks/live/forensic-menu.binary @@ -12,4 +12,3 @@ label live-forensic initrd /live/initrd.img append boot=live username=kali hostname=kali systemd.swap=no noautomount END - diff --git a/kali-config/common/includes.installer/preseed.cfg b/kali-config/common/includes.installer/preseed.cfg index ba059eb..0a42d7c 100644 --- a/kali-config/common/includes.installer/preseed.cfg +++ b/kali-config/common/includes.installer/preseed.cfg @@ -11,7 +11,7 @@ d-i mirror/http/hostname string http.kali.org d-i mirror/http/directory string /kali # Disable security, updates and backports -d-i apt-setup/services-select multiselect +d-i apt-setup/services-select multiselect # Enable contrib and non-free d-i apt-setup/non-free boolean true @@ -52,7 +52,7 @@ popularity-contest popularity-contest/participate boolean false console-setup console-setup/charmap47 select UTF-8 samba-common samba-common/dhcp boolean false macchanger macchanger/automatically_run boolean false -kismet-capture-common kismet-capture-common/install-users string +kismet-capture-common kismet-capture-common/install-users string kismet-capture-common kismet-capture-common/install-setuid boolean true wireshark-common wireshark-common/install-setuid boolean true sslh sslh/inetd_or_standalone select standalone diff --git a/kali-config/installer-default/packages b/kali-config/installer-default/packages index 5b4d692..c7d6d42 100644 --- a/kali-config/installer-default/packages +++ b/kali-config/installer-default/packages @@ -1,7 +1,7 @@ # Full installer image # It should contain everything offered in tasksel # during initial installation so all kali-linux-* except: -# - kali-linux-everything +# - kali-linux-everything # Metapackages # You can customize the set of Kali metapackages (groups of tools) to install diff --git a/simple-cdd/simple-cdd.conf b/simple-cdd/simple-cdd.conf index 5d533af..6992657 100644 --- a/simple-cdd/simple-cdd.conf +++ b/simple-cdd/simple-cdd.conf @@ -8,21 +8,20 @@ # Profile Selection # # The following four files get included on the CD if present: -# $profile.preseed +# $profile.preseed # Debconf selections. -# $profile.packages -# Packages to be installed with the profile. Dependencies also will +# $profile.packages +# Packages to be installed with the profile. Dependencies also will # be installed. -# $profile.downloads -# Additional packages to be included on the CD with this profile, but +# $profile.downloads +# Additional packages to be included on the CD with this profile, but # not installed by default. -# $profile.postinst +# $profile.postinst # Post-install script that is run after installing packages. # -# During the install after base system setup, it will give you the +# During the install after base system setup, it will give you the # options to determine which profiles you want to install. - # Profiles to include on the CD #profiles="" #profiles="x-basic ltsp" @@ -111,7 +110,7 @@ local_packages="$(pwd)/local_packages" # Call mirror tools at each build- defaults to true. #do_mirror="false" -# Set your proxy (if any). +# Set your proxy (if any). #export http_proxy=http://localhost:3128 # Location of debian-cd files