From 677f807caa81986c2f3a944e5ecdcfac7ac235a3 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 18 Jan 2019 13:06:19 +0100
Subject: remove deprecated modules

---
 .../modules.d/openslx_tmp_format/module-setup.sh   | 14 ------
 .../scripts/openslx_tmp_format.sh                  | 54 ----------------------
 .../modules.d/openslx_tmp_mount/module-setup.sh    | 14 ------
 .../openslx_tmp_mount/scripts/openslx_tmp_mount.sh | 11 -----
 4 files changed, 93 deletions(-)
 delete mode 100755 builder/modules.d/openslx_tmp_format/module-setup.sh
 delete mode 100755 builder/modules.d/openslx_tmp_format/scripts/openslx_tmp_format.sh
 delete mode 100755 builder/modules.d/openslx_tmp_mount/module-setup.sh
 delete mode 100755 builder/modules.d/openslx_tmp_mount/scripts/openslx_tmp_mount.sh

diff --git a/builder/modules.d/openslx_tmp_format/module-setup.sh b/builder/modules.d/openslx_tmp_format/module-setup.sh
deleted file mode 100755
index 551d2d8e..00000000
--- a/builder/modules.d/openslx_tmp_format/module-setup.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-check() {
-	# Tell dracut that this module should only be included if it is required
-	# explicitly.
-	return 255
-}
-depends() {
-	echo dnbd3-rootfs
-}
-install() {
-	inst_hook pre-pivot 20 "$moddir/scripts/openslx_tmp_format.sh"
-	inst_multiple mkfs.xfs mkfs.ext4
-}
diff --git a/builder/modules.d/openslx_tmp_format/scripts/openslx_tmp_format.sh b/builder/modules.d/openslx_tmp_format/scripts/openslx_tmp_format.sh
deleted file mode 100755
index 3cf5615e..00000000
--- a/builder/modules.d/openslx_tmp_format/scripts/openslx_tmp_format.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env bash
-#
-# Formats the partition used for "${NEWROOT}/tmp"
-# using filesystem given as SLX_TMP_PARTITION_FILESYSTEM
-# if possible. If not, it tries xfs and ext4 as fallbacks.
-
-command -v emergency_shell >/dev/null || source /lib/dracut-lib.sh
-
-. /usr/lib/openslx/tools.sh
-. /etc/openslx
-
-# If it is not set, assume the functionality is unwanted
-[ -z "${SLX_TMP_PARTITION_IDENTIFIER}" ] && return 0
-
-# Support comma-separated list of identifiers, e.g.
-# "OpenSLX-ID44,0x44" as these can match GPT label (recommended)
-SLX_TMP_PARTITION_DEVICE=
-for dev in $(find /dev -type b); do
-	udevadm info "$dev" \
-		| grep -qE 'ID_PART_ENTRY_(NAME|TYPE)=('"${SLX_TMP_PARTITION_IDENTIFIER//,/|}"')' \
-		&& SLX_TMP_PARTITION_DEVICE="$dev" && break
-done
-
-if [ -z "${SLX_TMP_PARTITION_DEVICE}" ]; then
-	warn "[${BASH_SOURCE[0]}] \
-		Could not find device matching identifiers: ${SLX_TMP_PARTITION_IDENTIFIER}."
-	return 1
-fi
-# remember in the main openslx config
-echo "SLX_TMP_PARTITION_DEVICE=${SLX_TMP_PARTITION_DEVICE}" >> /etc/openslx
-
-# Since a partition identifier is set and this module was built
-# assume that the partition should always be formatted.
-if [ -z "${SLX_TMP_PARTITION_FILESYSTEM_CREATE_COMMAND}" ] ||
-	! command -v "${SLX_TMP_PARTITION_FILESYSTEM_CREATE_COMMAND%%\ *}" >/dev/null; then
-	warn "[${BASH_SOURCE[0]}] \
-		'${SLX_TMP_PARTITION_FILESYSTEM_CREATE_COMMAND%%\ *}' invalid. Using fallbacks..."
-	# Fallbacks
-	if command -v mkfs.xfs >/dev/null; then
-		SLX_TMP_PARTITION_FILESYSTEM_CREATE_COMMAND="mkfs.xfs -f"
-	elif command -v mkfs.ext4 >/dev/null; then
-		SLX_TMP_PARTITION_FILESYSTEM_CREATE_COMMAND="mkfs.ext4 -F"
-	else
-		warn "[${BASH_SOURCE[0]}] No suitable mkfs command found! Skipping..."
-		return 1
-	fi
-fi
-
-if ! ${SLX_TMP_PARTITION_FILESYSTEM_CREATE_COMMAND} "${SLX_TMP_PARTITION_DEVICE}"; then
-	warn "[${BASH_SOURCE[0]}] \
-		Failed to format '${SLX_TMP_PARTITION_DEVICE}' using: \
-		${SLX_TMP_PARTITION_FILESYSTEM_CREATE_COMMAND}"
-	return 1
-fi
diff --git a/builder/modules.d/openslx_tmp_mount/module-setup.sh b/builder/modules.d/openslx_tmp_mount/module-setup.sh
deleted file mode 100755
index 896c6a9b..00000000
--- a/builder/modules.d/openslx_tmp_mount/module-setup.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-check() {
-	# Tell dracut that this module should only be included if it is required
-	# explicitly.
-	return 255
-}
-depends() {
-	echo dnbd3-rootfs
-}
-install() {
-	inst_hook pre-pivot 30 "$moddir/scripts/openslx_tmp_mount.sh"
-	inst_multiple chmod
-}
diff --git a/builder/modules.d/openslx_tmp_mount/scripts/openslx_tmp_mount.sh b/builder/modules.d/openslx_tmp_mount/scripts/openslx_tmp_mount.sh
deleted file mode 100755
index ddf974fc..00000000
--- a/builder/modules.d/openslx_tmp_mount/scripts/openslx_tmp_mount.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-. /etc/openslx
-
-# The device should have been discovered by openslx_tmp_format hook
-# and written to /etc/openslx
-if [ -n "${SLX_TMP_PARTITION_DEVICE}" ]; then
-	mount -t auto "${SLX_TMP_PARTITION_DEVICE}" "${NEWROOT}/tmp"
-	chmod a+rwxt "${NEWROOT}/tmp"
-	# TODO fstab
-fi
-- 
cgit v1.2.3-55-g7522