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/rootfs/rootfs-stage32/module.conf           |  1 -
 core/rootfs/rootfs-stage32/module.conf.ubuntu    |  3 ---
 core/rootfs/rootfs-stage32/module.conf.ubuntu.18 | 22 ++++++++++++++++++++++
 3 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 core/rootfs/rootfs-stage32/module.conf.ubuntu.18

(limited to 'core/rootfs')

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
+"
-- 
cgit v1.2.3-55-g7522