From d19ac3ae86e69f4fad970ef21bde1b2e1f89edd5 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Fri, 20 Aug 2021 14:37:49 +0200 Subject: [PATCH 1/2] login.postinstd remove cruft (closes: #989712) --- debian/login.postinst | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/debian/login.postinst b/debian/login.postinst index f4c3ce02..8f3ef552 100644 --- a/debian/login.postinst +++ b/debian/login.postinst @@ -2,18 +2,6 @@ set -e -if test "$1" = configure -then - if test -f /etc/init.d/logoutd - then - if test "$(md5sum /etc/init.d/logoutd)" = "9080f92783dd53f6f2108e698c06bd53 /etc/init.d/logoutd" - then - echo "removing logoutd cruft" - rm /etc/init.d/logoutd - update-rc.d logoutd remove - fi - fi -fi if [ "$1" = "configure" ]; then # Install faillog during initial installs only @@ -37,19 +25,6 @@ if [ "$1" = "configure" ]; then fi fi - # Create subuid/subgid if missing - if [ ! -e /etc/subuid ]; then - touch /etc/subuid - chown root:root /etc/subuid - chmod 644 /etc/subuid - fi - - if [ ! -e /etc/subgid ]; then - touch /etc/subgid - chown root:root /etc/subgid - chmod 644 /etc/subgid - fi - #DEBHELPER# exit 0 From 06d1bd8617d04b1e8812160d39d70c97085b3282 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Fri, 20 Aug 2021 14:39:17 +0200 Subject: [PATCH 2/2] login.postinstd support for DPKG_ROOT (closes: #992578) --- debian/login.postinst | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/debian/login.postinst b/debian/login.postinst index 8f3ef552..2261e1b6 100644 --- a/debian/login.postinst +++ b/debian/login.postinst @@ -5,23 +5,23 @@ set -e if [ "$1" = "configure" ]; then # Install faillog during initial installs only - if [ "$2" = "" ] && [ ! -f /var/log/faillog ] ; then - touch /var/log/faillog - chown root:root /var/log/faillog - chmod 644 /var/log/faillog + if [ "$2" = "" ] && [ ! -f "$DPKG_ROOT/var/log/faillog" ] ; then + touch "$DPKG_ROOT/var/log/faillog" + chown 0:0 "$DPKG_ROOT/var/log/faillog" + chmod 644 "$DPKG_ROOT/var/log/faillog" fi # Create subuid/subgid if missing - if [ ! -e /etc/subuid ]; then - touch /etc/subuid - chown root:root /etc/subuid - chmod 644 /etc/subuid + if [ ! -e "$DPKG_ROOT/etc/subuid" ]; then + touch "$DPKG_ROOT/etc/subuid" + chown 0:0 "$DPKG_ROOT/etc/subuid" + chmod 644 "$DPKG_ROOT/etc/subuid" fi - if [ ! -e /etc/subgid ]; then - touch /etc/subgid - chown root:root /etc/subgid - chmod 644 /etc/subgid + if [ ! -e "$DPKG_ROOT/etc/subgid" ]; then + touch "$DPKG_ROOT/etc/subgid" + chown 0:0 "$DPKG_ROOT/etc/subgid" + chmod 644 "$DPKG_ROOT/etc/subgid" fi fi