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