Harald Hoyer 460d2c
From fe761330e5db60f19f0ab2d937ea71a5b2438656 Mon Sep 17 00:00:00 2001
Harald Hoyer 460d2c
From: mulhern <amulhern@redhat.com>
Harald Hoyer 460d2c
Date: Wed, 19 Aug 2020 11:11:14 -0400
Harald Hoyer 460d2c
Subject: [PATCH] Remove stratis module
Harald Hoyer 460d2c
Harald Hoyer 460d2c
It is obsolete. An approach which does not start the daemon is being worked
Harald Hoyer 460d2c
on.
Harald Hoyer 460d2c
Harald Hoyer 460d2c
Signed-off-by: mulhern <amulhern@redhat.com>
Harald Hoyer 460d2c
---
Harald Hoyer 460d2c
 dracut.spec                               |  1 -
Harald Hoyer 460d2c
 modules.d/90stratis/module-setup.sh       | 33 -------------------------------
Harald Hoyer 460d2c
 modules.d/90stratis/stratisd-init.service | 13 ------------
Harald Hoyer 460d2c
 modules.d/90stratis/stratisd-start.sh     |  3 ---
Harald Hoyer 460d2c
 modules.d/90stratis/stratisd-stop.sh      |  6 ------
Harald Hoyer 460d2c
 5 files changed, 56 deletions(-)
Harald Hoyer 460d2c
Harald Hoyer 460d2c
diff --git a/dracut.spec b/dracut.spec
Harald Hoyer 460d2c
index 872c21cf..b1891a2f 100644
Harald Hoyer 460d2c
--- a/dracut.spec
Harald Hoyer 460d2c
+++ b/dracut.spec
Harald Hoyer 460d2c
@@ -366,7 +366,6 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
Harald Hoyer 460d2c
 %{dracutlibdir}/modules.d/90mdraid
Harald Hoyer 460d2c
 %{dracutlibdir}/modules.d/90multipath
Harald Hoyer 460d2c
 %{dracutlibdir}/modules.d/90nvdimm
Harald Hoyer 460d2c
-%{dracutlibdir}/modules.d/90stratis
Harald Hoyer 460d2c
 %{dracutlibdir}/modules.d/90ppcmac
Harald Hoyer 460d2c
 %{dracutlibdir}/modules.d/90qemu
Harald Hoyer 460d2c
 %{dracutlibdir}/modules.d/91crypt-gpg
Harald Hoyer 460d2c
diff --git a/modules.d/90stratis/module-setup.sh b/modules.d/90stratis/module-setup.sh
Harald Hoyer 460d2c
deleted file mode 100755
Harald Hoyer 460d2c
index e13000b4..00000000
Harald Hoyer 460d2c
--- a/modules.d/90stratis/module-setup.sh
Harald Hoyer 460d2c
+++ /dev/null
Harald Hoyer 460d2c
@@ -1,33 +0,0 @@
Harald Hoyer 460d2c
-#!/bin/bash
Harald Hoyer 460d2c
-
Harald Hoyer 460d2c
-# called by dracut
Harald Hoyer 460d2c
-check() {
Harald Hoyer 460d2c
-    require_binaries stratisd-init thin_check thin_repair mkfs.xfs xfs_admin xfs_growfs || return 1
Harald Hoyer 460d2c
-    return 255
Harald Hoyer 460d2c
-}
Harald Hoyer 460d2c
-
Harald Hoyer 460d2c
-# called by dracut
Harald Hoyer 460d2c
-depends() {
Harald Hoyer 460d2c
-    echo dm
Harald Hoyer 460d2c
-    return 0
Harald Hoyer 460d2c
-}
Harald Hoyer 460d2c
-
Harald Hoyer 460d2c
-# called by dracut
Harald Hoyer 460d2c
-installkernel() {
Harald Hoyer 460d2c
-    instmods xfs
Harald Hoyer 460d2c
-}
Harald Hoyer 460d2c
-
Harald Hoyer 460d2c
-# called by dracut
Harald Hoyer 460d2c
-install() {
Harald Hoyer 460d2c
-
Harald Hoyer 460d2c
-    inst_multiple stratisd-init thin_check thin_repair mkfs.xfs xfs_admin xfs_growfs
Harald Hoyer 460d2c
-
Harald Hoyer 460d2c
-    if dracut_module_included "systemd"; then
Harald Hoyer 460d2c
-        inst_simple "${moddir}/stratisd-init.service" "${systemdsystemunitdir}/stratisd-init.service"
Harald Hoyer 460d2c
-        systemctl -q --root "$initdir" enable stratisd-init.service
Harald Hoyer 460d2c
-    else
Harald Hoyer 460d2c
-        inst_hook pre-mount 25 "$moddir/stratisd-start.sh"
Harald Hoyer 460d2c
-        inst_hook cleanup 25 "$moddir/stratisd-stop.sh"
Harald Hoyer 460d2c
-    fi
Harald Hoyer 460d2c
-}
Harald Hoyer 460d2c
-
Harald Hoyer 460d2c
diff --git a/modules.d/90stratis/stratisd-init.service b/modules.d/90stratis/stratisd-init.service
Harald Hoyer 460d2c
deleted file mode 100644
Harald Hoyer 460d2c
index 1be2e33b..00000000
Harald Hoyer 460d2c
--- a/modules.d/90stratis/stratisd-init.service
Harald Hoyer 460d2c
+++ /dev/null
Harald Hoyer 460d2c
@@ -1,13 +0,0 @@
Harald Hoyer 460d2c
-[Unit]
Harald Hoyer 460d2c
-Description=A daemon that manages a pool of block devices to create flexible file systems
Harald Hoyer 460d2c
-Documentation=man:stratisd(8)
Harald Hoyer 460d2c
-Before=local-fs-pre.target
Harald Hoyer 460d2c
-DefaultDependencies=no
Harald Hoyer 460d2c
-
Harald Hoyer 460d2c
-[Service]
Harald Hoyer 460d2c
-Type=simple
Harald Hoyer 460d2c
-ExecStart=/sbin/stratisd-init --debug
Harald Hoyer 460d2c
-KillSignal=SIGINT
Harald Hoyer 460d2c
-
Harald Hoyer 460d2c
-[Install]
Harald Hoyer 460d2c
-WantedBy=sysinit.target
Harald Hoyer 460d2c
diff --git a/modules.d/90stratis/stratisd-start.sh b/modules.d/90stratis/stratisd-start.sh
Harald Hoyer 460d2c
deleted file mode 100755
Harald Hoyer 460d2c
index afcd81fd..00000000
Harald Hoyer 460d2c
--- a/modules.d/90stratis/stratisd-start.sh
Harald Hoyer 460d2c
+++ /dev/null
Harald Hoyer 460d2c
@@ -1,3 +0,0 @@
Harald Hoyer 460d2c
-#!/bin/sh
Harald Hoyer 460d2c
-
Harald Hoyer 460d2c
-stratisd-init --debug > /dev/kmsg 2>&1 &
Harald Hoyer 460d2c
\ No newline at end of file
Harald Hoyer 460d2c
diff --git a/modules.d/90stratis/stratisd-stop.sh b/modules.d/90stratis/stratisd-stop.sh
Harald Hoyer 460d2c
deleted file mode 100755
Harald Hoyer 460d2c
index f394a843..00000000
Harald Hoyer 460d2c
--- a/modules.d/90stratis/stratisd-stop.sh
Harald Hoyer 460d2c
+++ /dev/null
Harald Hoyer 460d2c
@@ -1,6 +0,0 @@
Harald Hoyer 460d2c
-#!/bin/sh
Harald Hoyer 460d2c
-
Harald Hoyer 460d2c
-[ -f /lib/dracut-lib.sh ] && . /lib/dracut-lib.sh
Harald Hoyer 460d2c
-
Harald Hoyer 460d2c
-pid=$(pidof stratisd-init)
Harald Hoyer 460d2c
-[ -n "$pid" ] && kill ${pid}
Harald Hoyer 460d2c