From: Michael Prokop <mika@grml.org>
Date: Fri, 17 Nov 2023 16:40:34 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/pr/246'
X-Git-Tag: v0.105~6
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=52965f9002cfe576bb694bfc96cf5a69e07a1e22;hp=d275bdfe5ba2b9abcf67687311110ae2dc5ac90f

Merge remote-tracking branch 'origin/pr/246'
---

diff --git a/chroot-script b/chroot-script
index 1bd3abb..a077acd 100755
--- a/chroot-script
+++ b/chroot-script
@@ -384,9 +384,6 @@ passwords()
     return 0
   fi
 
-  echo "Activating shadow passwords."
-  shadowconfig on
-
   CHPASSWD_OPTION=
   if chpasswd --help 2>&1 | grep -q -- '-m,' ; then
      CHPASSWD_OPTION='-m'
diff --git a/tests/goss.yaml b/tests/goss.yaml
index 97b75d8..fdf8316 100644
--- a/tests/goss.yaml
+++ b/tests/goss.yaml
@@ -1,6 +1,7 @@
 process:
   sshd:
     running: true
+
 file:
   /etc/timezone:
     exists: true
@@ -9,3 +10,9 @@ file:
     filetype: symlink
     exists: true
     linked-to: /usr/share/zoneinfo/Europe/Vienna
+
+  # shadow passwords are enabled.
+  /etc/shadow:
+    exists: true
+  /etc/gshadow:
+    exists: true