From: Michael Prokop <mika@grml.org>
Date: Thu, 2 Feb 2023 12:41:24 +0000 (+0100)
Subject: Drop /etc/grml/fai/config/files/etc/lsb-base-logging.sh/GRMLBASE
X-Git-Tag: v0.43.0~7
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=d1575f1e7726c4cbdfa27bcff9ef973cdb6709e1

Drop /etc/grml/fai/config/files/etc/lsb-base-logging.sh/GRMLBASE

In lsb upstream (https://salsa.debian.org/debian/lsb.git) commit
c3632166b1 ("Hardcode ANSI escapes to replace tput in logging
functions") the "TPUT=/usr/bin/tput" definition got dropped. At the end
of the file /lib/lsb/init-functions (being part of sysvinit-utils
nowadays) it then sources /etc/lsb-base-logging.sh, iff the file exists.

Now that $TPUT is no longer defined, it's failing for us with:

| /etc/lsb-base-logging.sh: line 19: -S: command not found
| /etc/lsb-base-logging.sh: line 19: -S: command not found

It looks like the file /etc/lsb-base-logging.sh is no longer relevant
for Grml nowadays, especially with running on systemd (the file got
introduced back in 2011, git commit 00b607, and its last modification
dates back to 2012, see commit 9f40afc).

Unless we really have any special needs for deploying our own
/etc/lsb-base-logging.sh let's get rid of it. If we should ever
reintroduce it again, we definitely need to make sure we don't rely on
any specific upstream behavior though.

Closes: https://github.com/grml/grml-live/issues/125
---

diff --git a/debian/grml-live.maintscript b/debian/grml-live.maintscript
index 5ab930d..8b464d7 100644
--- a/debian/grml-live.maintscript
+++ b/debian/grml-live.maintscript
@@ -1,4 +1,5 @@
 rm_conffile /etc/grml/fai/config/files/etc/apt/grml.key/GRMLBASE 0.32.3~
+rm_conffile /etc/grml/fai/config/files/etc/lsb-base-logging.sh/GRMLBASE 0.42.3~
 rm_conffile /etc/grml/fai/config/files/etc/systemd/system/serial-getty@ttyS0.service.d/override.conf/GRMLBASE 0.33.2~
 rm_conffile /etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils 0.33.0~
 rm_conffile /etc/grml/fai/config/scripts/GRMLBASE/40-deborphan 0.35.0~
diff --git a/etc/grml/fai/config/files/etc/lsb-base-logging.sh/GRMLBASE b/etc/grml/fai/config/files/etc/lsb-base-logging.sh/GRMLBASE
deleted file mode 100644
index ec31701..0000000
--- a/etc/grml/fai/config/files/etc/lsb-base-logging.sh/GRMLBASE
+++ /dev/null
@@ -1,32 +0,0 @@
-# This file was deployed via grml-live's
-# ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/20-sudo script, using
-# ${GRML_FAI_CONFIG}/config/files/etc/lsb-base-logging.sh/GRMLBASE
-
-# override output of the status on the left side of the terminal
-# introduced in lsb-base >= 4.1+Debian1
-log_end_msg_pre() { :; }
-log_action_msg_pre() { :; }
-
-if log_use_fancy_output; then
-  __LSB_PFX="$($TPUT -S << EOGREEN
-  bold
-  setaf 2
-EOGREEN
-  ) * $($TPUT -S << EONORMAL
-  sgr0
-  op
-EONORMAL
-  )"
-else
-  __LSB_PFX=" * "
-fi
-
-log_daemon_msg_pre() {
-  printf "${__LSB_PFX}"
-}
-log_action_msg() {
-  printf "${__LSB_PFX}$@."
-}
-log_action_begin_msg() {
-  printf "${__LSB_PFX}$@... "
-}
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/42-branding b/etc/grml/fai/config/scripts/GRMLBASE/42-branding
index 8cdaed5..66746d9 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/42-branding
+++ b/etc/grml/fai/config/scripts/GRMLBASE/42-branding
@@ -9,7 +9,6 @@
 set -u
 set -e
 
-fcopy -v /etc/lsb-base-logging.sh
 fcopy -v /usr/share/initramfs-tools/scripts/init-top/grml
 fcopy -v /usr/share/grml/desktop-bg.png
 fcopy -v /usr/share/doc/grml-docs/startpage.html