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

grml · Nov 17, 2023 · 52965f9 · 52965f9
2 parents d275bdf + 64f1f16
commit 52965f9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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