From 1c7f9f7c578f81b5d7eb3e3a8a19f5617b6d64f7 Mon Sep 17 00:00:00 2001
From: Erich Eickmeyer <erich@ericheickmeyer.com>
Date: Tue, 28 Jun 2022 11:48:10 -0700
Subject: [PATCH] Remove remaining duplicate files that are in common

---
 ubuntustudio/modules/fstab.conf               |  2 --
 ubuntustudio/modules/machineid.conf           |  8 -----
 ubuntustudio/modules/mount.conf               | 35 -------------------
 .../modules/shellprocess_bug-LP#1829805.conf  |  5 ---
 ubuntustudio/modules/shellprocess_logs.conf   |  5 ---
 5 files changed, 55 deletions(-)
 delete mode 100644 ubuntustudio/modules/fstab.conf
 delete mode 100644 ubuntustudio/modules/machineid.conf
 delete mode 100644 ubuntustudio/modules/mount.conf
 delete mode 100644 ubuntustudio/modules/shellprocess_bug-LP#1829805.conf
 delete mode 100644 ubuntustudio/modules/shellprocess_logs.conf

diff --git a/ubuntustudio/modules/fstab.conf b/ubuntustudio/modules/fstab.conf
deleted file mode 100644
index 54b6d10..0000000
--- a/ubuntustudio/modules/fstab.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-crypttabOptions: luks,keyscript=/bin/cat
-efiMountOptions: umask=0077
diff --git a/ubuntustudio/modules/machineid.conf b/ubuntustudio/modules/machineid.conf
deleted file mode 100644
index 38753ae..0000000
--- a/ubuntustudio/modules/machineid.conf
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# Whether to create /etc/machine-id for systemd.
-systemd: true
-# Whether to create /var/lib/dbus/machine-id for D-Bus.
-dbus: true
-# Whether /var/lib/dbus/machine-id should be a symlink to /etc/machine-id
-# (ignored if dbus is false, or if there is no /etc/machine-id to point to).
-dbus-symlink: true
diff --git a/ubuntustudio/modules/mount.conf b/ubuntustudio/modules/mount.conf
deleted file mode 100644
index 155dca1..0000000
--- a/ubuntustudio/modules/mount.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-extraMounts:
-    - device: proc
-      fs: proc
-      mountPoint: /proc
-    - device: sys
-      fs: sysfs
-      mountPoint: /sys
-    - device: /dev
-      mountPoint: /dev
-      options: [ bind ]
-    - device: tmpfs
-      fs: tmpfs
-      mountPoint: /run
-    - device: /run/udev
-      mountPoint: /run/udev
-      options: [ bind ]
-    - device: efivarfs
-      fs: efivarfs
-      mountPoint: /sys/firmware/efi/efivars
-      efi: true
-
-mountOptions:
-    - filesystem: default
-      options: [ defaults ]
-    - filesystem: btrfs
-      options: [ defaults, noatime, autodefrag ]
-      ssdOptions: [ discard, compress=lzo ]
-    - filesystem: ext4
-      ssdOptions: [ discard ]
-    - filesystem: jfs
-      ssdOptions: [ discard ]
-    - filesystem: xfs
-      ssdOptions: [ discard ]
-    - filesystem: swap
-      ssdOptions: [ discard ]
diff --git a/ubuntustudio/modules/shellprocess_bug-LP#1829805.conf b/ubuntustudio/modules/shellprocess_bug-LP#1829805.conf
deleted file mode 100644
index 6f68ff3..0000000
--- a/ubuntustudio/modules/shellprocess_bug-LP#1829805.conf
+++ /dev/null
@@ -1,5 +0,0 @@
----
-dontChroot: false
-timeout: 30
-script:
-    - "touch ${ROOT}/boot/initrd.img-$(uname -r)"
diff --git a/ubuntustudio/modules/shellprocess_logs.conf b/ubuntustudio/modules/shellprocess_logs.conf
deleted file mode 100644
index b0d5872..0000000
--- a/ubuntustudio/modules/shellprocess_logs.conf
+++ /dev/null
@@ -1,5 +0,0 @@
----
-dontChroot: true
-timeout: 30
-script:
-    - calamares-logs-helper ${ROOT}