From 39a8188b4a0b9ec26c4240df9ba557768ece4c48 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 3 Aug 2020 14:43:37 +0200
Subject: Add support for Ubuntu 20.04 (TODO: systemd)

---
 core/modules/pam/module.conf           |  1 -
 core/modules/pam/module.conf.ubuntu    | 42 ++++++++++++++++++++++++++++++++++
 core/modules/pam/module.conf.ubuntu.14 | 37 ------------------------------
 core/modules/pam/module.conf.ubuntu.16 |  1 +
 core/modules/pam/module.conf.ubuntu.17 |  1 +
 core/modules/pam/module.conf.ubuntu.18 |  1 +
 6 files changed, 45 insertions(+), 38 deletions(-)
 create mode 100644 core/modules/pam/module.conf.ubuntu
 delete mode 100644 core/modules/pam/module.conf.ubuntu.14

(limited to 'core/modules/pam')

diff --git a/core/modules/pam/module.conf b/core/modules/pam/module.conf
index 14a9890a..86b91b8d 100644
--- a/core/modules/pam/module.conf
+++ b/core/modules/pam/module.conf
@@ -22,7 +22,6 @@ REQUIRED_DIRECTORIES="
 "
 REQUIRED_SYSTEM_FILES="
 	/etc/login.defs
-	/etc/securetty
 "
 REQUIRED_GIT="
 	https://github.com/jeroennijhof/pam_script.git
diff --git a/core/modules/pam/module.conf.ubuntu b/core/modules/pam/module.conf.ubuntu
new file mode 100644
index 00000000..8e934bd3
--- /dev/null
+++ b/core/modules/pam/module.conf.ubuntu
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+REQUIRED_INSTALLED_PACKAGES="
+	libpam-cap
+	krb5-user
+	krb5-config
+	libpam-krb5
+	libssl-dev
+	ldap-utils
+	libnfsidmap2
+	nfs-common
+	libpam0g-dev
+	cifs-utils
+	libtool
+"
+REQUIRED_CONTENT_PACKAGES="
+	libpam0g
+	libpam-modules
+	libpam-modules-bin
+	libpam-cap
+	libldap-2.4-2
+	krb5-user
+	krb5-config
+	libpam-krb5
+	ldap-utils
+	libnfsidmap2
+	nfs-common
+	cifs-utils
+	keyutils
+"
+REQUIRED_BINARIES+="
+	mount.cifs
+"
+REQUIRED_DIRECTORIES+="
+	$SYS_PAM_MODULES_PATH
+	/lib
+	/usr/lib
+"
+REQUIRED_SYSTEM_FILES+="
+	/etc/pam.conf
+	/etc/default/locale
+"
diff --git a/core/modules/pam/module.conf.ubuntu.14 b/core/modules/pam/module.conf.ubuntu.14
deleted file mode 100644
index df6df6db..00000000
--- a/core/modules/pam/module.conf.ubuntu.14
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
-	krb5-user
-	krb5-config
-	libpam-krb5
-	libssl-dev
-	ldap-utils
-	libnfsidmap2
-	nfs-common
-	libpam0g-dev
-	cifs-utils
-	libpam-modules-bin
-	keyutils
-"
-REQUIRED_CONTENT_PACKAGES="
-	libpam0g
-	libpam-modules
-	libpam-cap
-	krb5-user
-	krb5-config
-	libpam-krb5
-	ldap-utils
-	libnfsidmap2
-	nfs-common
-	cifs-utils
-	libpam-modules-bin
-	keyutils
-"
-REQUIRED_DIRECTORIES+="
-	$SYS_PAM_MODULES_PATH
-	/lib
-	/usr/lib
-"
-REQUIRED_SYSTEM_FILES+="
-	/etc/pam.conf
-	/etc/default/locale
-"
diff --git a/core/modules/pam/module.conf.ubuntu.16 b/core/modules/pam/module.conf.ubuntu.16
index 378ef1f5..4d09bbd5 100644
--- a/core/modules/pam/module.conf.ubuntu.16
+++ b/core/modules/pam/module.conf.ubuntu.16
@@ -36,6 +36,7 @@ REQUIRED_DIRECTORIES+="
 	/usr/lib
 "
 REQUIRED_SYSTEM_FILES+="
+	/etc/securetty
 	/etc/pam.conf
 	/etc/default/locale
 "
diff --git a/core/modules/pam/module.conf.ubuntu.17 b/core/modules/pam/module.conf.ubuntu.17
index 378ef1f5..4d09bbd5 100644
--- a/core/modules/pam/module.conf.ubuntu.17
+++ b/core/modules/pam/module.conf.ubuntu.17
@@ -36,6 +36,7 @@ REQUIRED_DIRECTORIES+="
 	/usr/lib
 "
 REQUIRED_SYSTEM_FILES+="
+	/etc/securetty
 	/etc/pam.conf
 	/etc/default/locale
 "
diff --git a/core/modules/pam/module.conf.ubuntu.18 b/core/modules/pam/module.conf.ubuntu.18
index 8e934bd3..7f0fcaca 100644
--- a/core/modules/pam/module.conf.ubuntu.18
+++ b/core/modules/pam/module.conf.ubuntu.18
@@ -37,6 +37,7 @@ REQUIRED_DIRECTORIES+="
 	/usr/lib
 "
 REQUIRED_SYSTEM_FILES+="
+	/etc/securetty
 	/etc/pam.conf
 	/etc/default/locale
 "
-- 
cgit v1.2.3-55-g7522