Merge pull request chef#693 from jfilip/bug/debian_halt_failing/692

Install libpam-systemd on systemd-enabled Debian versions.
legal90 · Oct 21, 2016 · 3d9525b · 3d9525b
2 parents e63d55e + 2eb1f59
commit 3d9525b
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 0 deletions.
diff --git a/archive/debian-8.1-amd64.json b/archive/debian-8.1-amd64.json
@@ -209,6 +209,7 @@
         "scripts/debian/networking.sh",
         "scripts/debian/sudoers.sh",
         "scripts/common/vagrant.sh",
+        "scripts/debian/systemd.sh",
         "scripts/common/vmtools.sh",
         "scripts/debian/cleanup.sh",
         "scripts/common/minimize.sh"

diff --git a/archive/debian-8.1-i386.json b/archive/debian-8.1-i386.json
@@ -209,6 +209,7 @@
         "scripts/debian/networking.sh",
         "scripts/debian/sudoers.sh",
         "scripts/common/vagrant.sh",
+        "scripts/debian/systemd.sh",
         "scripts/common/vmtools.sh",
         "scripts/debian/cleanup.sh",
         "scripts/common/minimize.sh"

diff --git a/archive/debian-8.2-amd64.json b/archive/debian-8.2-amd64.json
@@ -209,6 +209,7 @@
         "scripts/debian/networking.sh",
         "scripts/debian/sudoers.sh",
         "scripts/common/vagrant.sh",
+        "scripts/debian/systemd.sh",
         "scripts/common/vmtools.sh",
         "scripts/debian/cleanup.sh",
         "scripts/common/minimize.sh"

diff --git a/archive/debian-8.2-i386.json b/archive/debian-8.2-i386.json
@@ -209,6 +209,7 @@
         "scripts/debian/networking.sh",
         "scripts/debian/sudoers.sh",
         "scripts/common/vagrant.sh",
+        "scripts/debian/systemd.sh",
         "scripts/common/vmtools.sh",
         "scripts/debian/cleanup.sh",
         "scripts/common/minimize.sh"

diff --git a/archive/debian-8.3-amd64.json b/archive/debian-8.3-amd64.json
@@ -209,6 +209,7 @@
         "scripts/debian/networking.sh",
         "scripts/debian/sudoers.sh",
         "scripts/common/vagrant.sh",
+        "scripts/debian/systemd.sh",
         "scripts/common/vmtools.sh",
         "scripts/debian/cleanup.sh",
         "scripts/common/minimize.sh"

diff --git a/archive/debian-8.3-i386.json b/archive/debian-8.3-i386.json
@@ -209,6 +209,7 @@
         "scripts/debian/networking.sh",
         "scripts/debian/sudoers.sh",
         "scripts/common/vagrant.sh",
+        "scripts/debian/systemd.sh",
         "scripts/common/vmtools.sh",
         "scripts/debian/cleanup.sh",
         "scripts/common/minimize.sh"

diff --git a/archive/debian-8.4-amd64.json b/archive/debian-8.4-amd64.json
@@ -210,6 +210,7 @@
         "scripts/debian/networking.sh",
         "scripts/debian/sudoers.sh",
         "scripts/common/vagrant.sh",
+        "scripts/debian/systemd.sh",
         "scripts/common/vmtools.sh",
         "scripts/debian/cleanup.sh",
         "scripts/common/minimize.sh"

diff --git a/archive/debian-8.4-i386.json b/archive/debian-8.4-i386.json
@@ -210,6 +210,7 @@
         "scripts/debian/networking.sh",
         "scripts/debian/sudoers.sh",
         "scripts/common/vagrant.sh",
+        "scripts/debian/systemd.sh",
         "scripts/common/vmtools.sh",
         "scripts/debian/cleanup.sh",
         "scripts/common/minimize.sh"

diff --git a/archive/debian-8.5-amd64.json b/archive/debian-8.5-amd64.json
@@ -212,6 +212,7 @@
         "scripts/common/vagrant.sh",
         "scripts/common/virtualbox.sh",
         "scripts/common/vmware.sh",
+        "scripts/debian/systemd.sh",
         "scripts/common/parallels.sh",
         "scripts/debian/cleanup.sh",
         "scripts/common/minimize.sh"

diff --git a/archive/debian-8.5-i386.json b/archive/debian-8.5-i386.json
@@ -212,6 +212,7 @@
         "scripts/common/vagrant.sh",
         "scripts/common/virtualbox.sh",
         "scripts/common/vmware.sh",
+        "scripts/debian/systemd.sh",
         "scripts/common/parallels.sh",
         "scripts/debian/cleanup.sh",
         "scripts/common/minimize.sh"

diff --git a/debian-8.6-amd64.json b/debian-8.6-amd64.json
@@ -210,6 +210,7 @@
         "scripts/debian/networking.sh",
         "scripts/debian/sudoers.sh",
         "scripts/common/vagrant.sh",
+        "scripts/debian/systemd.sh",
         "scripts/common/virtualbox.sh",
         "scripts/common/vmware.sh",
         "scripts/common/parallels.sh",

diff --git a/debian-8.6-i386.json b/debian-8.6-i386.json
@@ -210,6 +210,7 @@
         "scripts/debian/networking.sh",
         "scripts/debian/sudoers.sh",
         "scripts/common/vagrant.sh",
+        "scripts/debian/systemd.sh",
         "scripts/common/virtualbox.sh",
         "scripts/common/vmware.sh",
         "scripts/common/parallels.sh",

diff --git a/scripts/debian/systemd.sh b/scripts/debian/systemd.sh
@@ -0,0 +1,4 @@
+#!/bin/sh -eux
+
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=751636
+apt-get install libpam-systemd