From b52163058d67431a32ee3007d8e8a1fbe6db8e62 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Mon, 13 Apr 2020 16:17:22 +0200 Subject: [PATCH] hooks: disable USE_DPKG to allow localepurge to run, re-enable it afterwards fix formatting of debug messages --- .../normal/0090-remove-unwanted-packages.hook.chroot | 2 +- .../0350-update-default-services-status.hook.chroot | 2 +- .../0425-update-session-manager-alternative.hook.chroot | 2 +- config/hooks/normal/0450-enable-multiarch.hook.chroot | 2 +- config/hooks/normal/0500-localepurge.hook.chroot | 8 +++++++- config/hooks/normal/0900-clear-apt-cache.hook.chroot | 2 +- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/config/hooks/normal/0090-remove-unwanted-packages.hook.chroot b/config/hooks/normal/0090-remove-unwanted-packages.hook.chroot index a6a4e71..faa6220 100755 --- a/config/hooks/normal/0090-remove-unwanted-packages.hook.chroot +++ b/config/hooks/normal/0090-remove-unwanted-packages.hook.chroot @@ -1,3 +1,3 @@ #!/bin/bash -echo "running [$0]" +echo "I: running $0" aptitude -y purge exim4-base nfs-common rpcbind \ No newline at end of file diff --git a/config/hooks/normal/0350-update-default-services-status.hook.chroot b/config/hooks/normal/0350-update-default-services-status.hook.chroot index 9936408..bd4f3a6 100755 --- a/config/hooks/normal/0350-update-default-services-status.hook.chroot +++ b/config/hooks/normal/0350-update-default-services-status.hook.chroot @@ -1,5 +1,5 @@ #!/bin/bash -echo "running [$0]" +echo "I: running $0" disabled_services="avahi-daemon.service openvpn.service rsync.service ssh.service nmbd.service smbd.service libvirtd.service libvirt-guests.service" enabled_services="bumblebeed.service cups-browsed.service bluetooth.service cups.service fancontrol.service laptop-mode.service ntp.service plymouth.service preload.service smartmontools.service rsyslog.service lm-sensors.service hddtemp.service haveged.service" diff --git a/config/hooks/normal/0425-update-session-manager-alternative.hook.chroot b/config/hooks/normal/0425-update-session-manager-alternative.hook.chroot index 7556b08..129a101 100755 --- a/config/hooks/normal/0425-update-session-manager-alternative.hook.chroot +++ b/config/hooks/normal/0425-update-session-manager-alternative.hook.chroot @@ -1,3 +1,3 @@ #!/bin/bash -echo "running [$0]" +echo "I: running $0" update-alternatives --set x-session-manager /usr/bin/xfce4-session \ No newline at end of file diff --git a/config/hooks/normal/0450-enable-multiarch.hook.chroot b/config/hooks/normal/0450-enable-multiarch.hook.chroot index ebf4378..2b3eb3a 100755 --- a/config/hooks/normal/0450-enable-multiarch.hook.chroot +++ b/config/hooks/normal/0450-enable-multiarch.hook.chroot @@ -1,4 +1,4 @@ #!/bin/bash -echo "running [$0]" +echo "I: running $0" dpkg --add-architecture i386 apt update \ No newline at end of file diff --git a/config/hooks/normal/0500-localepurge.hook.chroot b/config/hooks/normal/0500-localepurge.hook.chroot index aed3d5b..431827d 100755 --- a/config/hooks/normal/0500-localepurge.hook.chroot +++ b/config/hooks/normal/0500-localepurge.hook.chroot @@ -1,4 +1,10 @@ #!/bin/bash -echo "running [$0]" +echo "I: running $0" locale-gen --keep-existing + +# USE_DPKG must be disabled in localepurge configuration before running manually, else it will do nothing +sed -i 's/^USE_DPKG/#USE_DPKG/' /etc/locale.nopurge localepurge + +# re-enable USE_DPKG +sed -i 's/^#USE_DPKG/USE_DPKG/' /etc/locale.nopurge diff --git a/config/hooks/normal/0900-clear-apt-cache.hook.chroot b/config/hooks/normal/0900-clear-apt-cache.hook.chroot index c64df36..63c5d10 100755 --- a/config/hooks/normal/0900-clear-apt-cache.hook.chroot +++ b/config/hooks/normal/0900-clear-apt-cache.hook.chroot @@ -1,5 +1,5 @@ #!/bin/sh -echo "running [$0]" +echo "I: running $0" # clear APT package download cache to reduce the image size from ~100MB rm -vr /var/lib/apt/lists/