Add support for Ubuntu 20.04 (TODO: systemd)

18 files changed, 82 insertions, 81 deletions

diff --git a/core/modules/cups/module.conf.ubuntu b/core/modules/cups/module.conf.ubuntu
index 5c4d995a..2aa8b5ed 100644
--- a/core/modules/cups/module.conf.ubuntu
+++ b/core/modules/cups/module.conf.ubuntu
@@ -1,11 +1,15 @@
 #!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
-		cups
-		ghostscript-cups
-		foomatic-filters
-"
 REQUIRED_CONTENT_PACKAGES="
 		cups
-		ghostscript-cups
-		foomatic-filters
+		cups-daemon
+		cups-filters
+		cups-core-drivers
+		cups-filters-core-drivers
+		ghostscript
+		hplip
+		libgs9-common
+"
+REQUIRED_DIRECTORIES+="
+	/usr/share/color
 "
+
diff --git a/core/modules/cups/module.conf.ubuntu.18 b/core/modules/cups/module.conf.ubuntu.18
deleted file mode 100644
index 2aa8b5ed..00000000
--- a/core/modules/cups/module.conf.ubuntu.18
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-REQUIRED_CONTENT_PACKAGES="
-		cups
-		cups-daemon
-		cups-filters
-		cups-core-drivers
-		cups-filters-core-drivers
-		ghostscript
-		hplip
-		libgs9-common
-"
-REQUIRED_DIRECTORIES+="
-	/usr/share/color
-"
-
diff --git a/core/modules/dbus/module.conf.ubuntu b/core/modules/dbus/module.conf.ubuntu
index 01eb9030..159cc642 100644
--- a/core/modules/dbus/module.conf.ubuntu
+++ b/core/modules/dbus/module.conf.ubuntu
@@ -4,6 +4,7 @@ REQUIRED_CONTENT_PACKAGES="
 			dbus-x11
 "
 REQUIRED_FILES+="
-			/etc/default/dbus
 "
-
+REQUIRED_DIRECTORIES="
+			/usr/share/dbus-1
+"
diff --git a/core/modules/dbus/module.conf.ubuntu.18 b/core/modules/dbus/module.conf.ubuntu.18
deleted file mode 100644
index 159cc642..00000000
--- a/core/modules/dbus/module.conf.ubuntu.18
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-REQUIRED_CONTENT_PACKAGES="
-			dbus
-			dbus-x11
-"
-REQUIRED_FILES+="
-"
-REQUIRED_DIRECTORIES="
-			/usr/share/dbus-1
-"
diff --git a/core/modules/openbox/module.conf.ubuntu b/core/modules/openbox/module.conf.ubuntu
index 8dd94ae0..7614a01d 100644
--- a/core/modules/openbox/module.conf.ubuntu
+++ b/core/modules/openbox/module.conf.ubuntu
@@ -1,13 +1,11 @@
 #!/bin/bash
 REQUIRED_INSTALLED_PACKAGES="
 			openbox
-			libpango1.0-0
 			libpango1.0-dev
 			libdbus-1-dev
 "
 REQUIRED_CONTENT_PACKAGES="
 			openbox
-			libpango1.0-0
 			libpango1.0-dev
 			libdbus-1-dev
 "
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.14 b/core/modules/pam/module.conf.ubuntu
index df6df6db..8e934bd3 100644
--- a/core/modules/pam/module.conf.ubuntu.14
+++ b/core/modules/pam/module.conf.ubuntu
@@ -1,5 +1,7 @@
 #!/bin/bash
+
 REQUIRED_INSTALLED_PACKAGES="
+	libpam-cap
 	krb5-user
 	krb5-config
 	libpam-krb5
@@ -9,13 +11,14 @@ REQUIRED_INSTALLED_PACKAGES="
 	nfs-common
 	libpam0g-dev
 	cifs-utils
-	libpam-modules-bin
-	keyutils
+	libtool
 "
 REQUIRED_CONTENT_PACKAGES="
 	libpam0g
 	libpam-modules
+	libpam-modules-bin
 	libpam-cap
+	libldap-2.4-2
 	krb5-user
 	krb5-config
 	libpam-krb5
@@ -23,9 +26,11 @@ REQUIRED_CONTENT_PACKAGES="
 	libnfsidmap2
 	nfs-common
 	cifs-utils
-	libpam-modules-bin
 	keyutils
 "
+REQUIRED_BINARIES+="
+	mount.cifs
+"
 REQUIRED_DIRECTORIES+="
 	$SYS_PAM_MODULES_PATH
 	/lib
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
 "
diff --git a/core/modules/polkit/module.conf.ubuntu b/core/modules/polkit/module.conf.ubuntu
index 27af83af..a4abcf92 100644
--- a/core/modules/polkit/module.conf.ubuntu
+++ b/core/modules/polkit/module.conf.ubuntu
@@ -7,9 +7,8 @@ REQUIRED_CONTENT_PACKAGES="
 "
 REQUIRED_DIRECTORIES+="
 	/usr/lib/policykit-1
-	/usr${ARCH_LIB_DIR}/polkit-1
 	/var/lib/polkit-1
-	/etc/dbus-1/system.d
+	/usr/share/dbus-1/system.d
 "
 # Module specific: Root of dirstructs we need directly from system
 REQUIRED_DIR_STRUCT="
diff --git a/core/modules/polkit/module.conf.ubuntu.18 b/core/modules/polkit/module.conf.ubuntu.18
new file mode 100644
index 00000000..27af83af
--- /dev/null
+++ b/core/modules/polkit/module.conf.ubuntu.18
@@ -0,0 +1,19 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES=""
+#	libmozjs185-1.0
+REQUIRED_CONTENT_PACKAGES="
+	policykit-1
+	policykit-desktop-privileges
+"
+REQUIRED_DIRECTORIES+="
+	/usr/lib/policykit-1
+	/usr${ARCH_LIB_DIR}/polkit-1
+	/var/lib/polkit-1
+	/etc/dbus-1/system.d
+"
+# Module specific: Root of dirstructs we need directly from system
+REQUIRED_DIR_STRUCT="
+	/var/lib/polkit-1
+	/etc/polkit-1
+"
+
diff --git a/core/modules/sssd/module.conf.ubuntu.18 b/core/modules/sssd/module.conf.ubuntu.18
new file mode 100644
index 00000000..cdf9ca36
--- /dev/null
+++ b/core/modules/sssd/module.conf.ubuntu.18
@@ -0,0 +1,15 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+	sssd-common
+	sssd-ldap
+	libldb1
+	libnss-sss
+	libpam-sss
+"
+REQUIRED_CONTENT_PACKAGES="
+	sssd-common
+	sssd-ldap
+	libldb1
+	libnss-sss
+	libpam-sss
+"
diff --git a/core/modules/udisks/module.conf.ubuntu b/core/modules/udisks/module.conf.ubuntu
index 6b483bc3..0a703589 100644
--- a/core/modules/udisks/module.conf.ubuntu
+++ b/core/modules/udisks/module.conf.ubuntu
@@ -1,35 +1,7 @@
 #!/bin/bash
 REQUIRED_INSTALLED_PACKAGES="
-	udisks
 	udisks2
 "
 REQUIRED_CONTENT_PACKAGES="
-	udisks
 	udisks2
 "
-# Add these for udisks 1 (required by kde)
-REQUIRED_BINARIES+="
-	udisks-helper-linux-md-check
-	udisks-daemon
-	udisks-helper-change-luks-password
-	udisks-helper-create-partition-table
-	udisks-helper-mdadm-expand
-	udisks-helper-drive-benchmark
-	udisks-helper-drive-detach
-	udisks-helper-mkfs
-	udisks-helper-ata-smart-collect
-	udisks-helper-change-filesystem-label
-	udisks-helper-modify-partition
-	udisks-helper-delete-partition
-	udisks-helper-create-partition
-	udisks-helper-fstab-mounter
-	udisks-helper-linux-md-remove-component
-	udisks-helper-ata-smart-selftest
-	udisks-helper-drive-poll
-	udisks-dm-export
-	udisks-lvm-pv-export
-	udisks-part-id
-	udisks-probe-ata-smart
-	udisks-probe-sas-expander
-"
-
diff --git a/core/modules/udisks/module.conf.ubuntu.18 b/core/modules/udisks/module.conf.ubuntu.18
deleted file mode 100644
index 0a703589..00000000
--- a/core/modules/udisks/module.conf.ubuntu.18
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
-	udisks2
-"
-REQUIRED_CONTENT_PACKAGES="
-	udisks2
-"
diff --git a/core/rootfs/rootfs-stage32/module.conf b/core/rootfs/rootfs-stage32/module.conf
index 1ddad8f3..5fb5a08a 100644
--- a/core/rootfs/rootfs-stage32/module.conf
+++ b/core/rootfs/rootfs-stage32/module.conf
@@ -74,7 +74,6 @@ REQUIRED_FILES="
 	/etc/inputrc
 	/etc/localtime
 	/etc/login.defs
-	/etc/securetty
 	/etc/protocols
 	/etc/services
 	/etc/networks
diff --git a/core/rootfs/rootfs-stage32/module.conf.ubuntu b/core/rootfs/rootfs-stage32/module.conf.ubuntu
index b3290d9f..a27b3bc9 100644
--- a/core/rootfs/rootfs-stage32/module.conf.ubuntu
+++ b/core/rootfs/rootfs-stage32/module.conf.ubuntu
@@ -17,6 +17,3 @@ REQUIRED_INSTALLED_PACKAGES="
 REQUIRED_CONTENT_PACKAGES="
 			openssl
 "
-REQUIRED_LIBRARIES+="
-	libcidn
-"
diff --git a/core/rootfs/rootfs-stage32/module.conf.ubuntu.18 b/core/rootfs/rootfs-stage32/module.conf.ubuntu.18
new file mode 100644
index 00000000..b3290d9f
--- /dev/null
+++ b/core/rootfs/rootfs-stage32/module.conf.ubuntu.18
@@ -0,0 +1,22 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+			nfs-common
+			squashfs-tools
+			whois
+			xfsprogs
+			jfsutils
+			curl
+			openssl
+			gawk
+			e2fsprogs
+			util-linux
+			kbd
+			dosfstools
+			strace
+"
+REQUIRED_CONTENT_PACKAGES="
+			openssl
+"
+REQUIRED_LIBRARIES+="
+	libcidn
+"