Also disable APT recommends installations for server.

diff --git a/setup_scripts/_lib.sh b/setup_scripts/_lib.sh
index d9f941ec82e22f13ac7aa461d45b1195f993f8e7..5d9e37f0b871f5c3fe56c5092c9e7844b346c4e9 100644 (file)
--- a/setup_scripts/_lib.sh
+++ b/setup_scripts/_lib.sh
@@ -14,6 +14,7 @@ TO_RBIND="${NAME_DEV} proc sys"
 NAME_DATA=data
 NAME_LUKSVG=cryptolvm
 NAME_SWAP=swap
+PATH_APT_NORECOMMENDS=/etc/apt/apt.conf.d/90-no-recommends
 PATH_MNT_ROOT="${PATH_MNT}/root"
 USERNAME=plom
 
@@ -191,3 +192,9 @@ start_root() {
 
     augment_profile
 }
+disable_apt_recommends() {
+    local PREFIX=${1:-}
+    local TARGET="${PREFIX}${PATH_APT_NORECOMMENDS}"
+    msg 'Disabling automatic installation of APT recommends …'
+    printf 'APT::Install-Recommends "false";\n' >| "${TARGET}"
+}

diff --git a/setup_scripts/install_debian.sh b/setup_scripts/install_debian.sh
index 144e52f76ab26887f2682e8398500aabda99739d..fa4d35343cacf19ca2757f70a08f181e040bff36 100755 (executable)
--- a/setup_scripts/install_debian.sh
+++ b/setup_scripts/install_debian.sh
@@ -5,7 +5,6 @@
 FNAME_INITRD=initrd.img
 FNAME_NM_CONN=wifi.nmconnection
 FNAME_VMLINUZ=vmlinuz
-PATH_APT_NORECOMMENDS=/etc/apt/apt.conf.d/90-no-recommends
 PATH_CRYPTTAB=/etc/crypttab
 PATH_EFI=/boot/efi
 PATH_FSTAB=/etc/fstab
@@ -25,7 +24,6 @@ NAME_ROOT="${NAME_BOOT}"
 
 # constants derived from changeables
 PATH_EFI_NAME_BOOT="${PATH_EFI}/${NAME_BOOT}"
-PATH_MNT_APT_NORECOMMENDS="${PATH_MNT_ROOT}${PATH_APT_NORECOMMENDS}"
 PATH_MNT_APT_SOURCES="${PATH_MNT_ROOT}/etc/apt/sources.list"
 PATH_MNT_CRYPTTAB="${PATH_MNT_ROOT}${PATH_CRYPTTAB}"
 PATH_MNT_FSTAB="${PATH_MNT_ROOT}${PATH_FSTAB}"
@@ -84,8 +82,7 @@ printf '%s UUID=%s none luks\n' \
 msg 'Enabling non-free-firmware component in target sources.list …'
 sed -i 's/ main$/ main non-free-firmware/' "${PATH_MNT_APT_SOURCES}"
 
-msg 'Disabling automatic installation of APT recommends …'
-printf 'APT::Install-Recommends "false";\n' >| "${PATH_MNT_APT_NORECOMMENDS}"
+disable_apt_recommends "${PATH_MNT_ROOT}"
 
 msg 'Into chroot environment installing LVM tools, kernel, initrd etc. …'
 chroot_sh "apt-get -qq update"

diff --git a/setup_scripts/start_root_server.sh b/setup_scripts/start_root_server.sh
index 35c69a8555a02d0488448fdef2018e0552b24bd5..21bbc5b9af20e2d94da53f7826f0643aaad44c03 100755 (executable)
--- a/setup_scripts/start_root_server.sh
+++ b/setup_scripts/start_root_server.sh
@@ -8,6 +8,7 @@ PATH_SSHD_DROPIN=/etc/ssh/sshd_config.d/60-ssh-hardening.conf
 PATH_HOME_USER="/home/${USERNAME}"
 PATH_USER_SSH="${PATH_HOME_USER}/${DIRNAME_SSH}"
 
+disable_apt_recommends
 start_root server
 
 msg 'Moving ssh access from root to user …'