replaced check,install,installkernel with module-info.sh

4 files changed, 24 insertions, 20 deletions

diff --git a/modules.d/95dasd_mod/check b/modules.d/95dasd_mod/check
deleted file mode 100755
index dcd24216..00000000
--- a/modules.d/95dasd_mod/check
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-arch=$(uname -m)
-[ "$arch" = "s390" -o "$arch" = "s390x" ] || exit 1 
-
-exit 0
diff --git a/modules.d/95dasd_mod/install b/modules.d/95dasd_mod/install
deleted file mode 100755
index 3a74a7a7..00000000
--- a/modules.d/95dasd_mod/install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-inst_hook cmdline 31 "$moddir/parse-dasd-mod.sh"
-dracut_install dasd_cio_free grep sed seq
-
diff --git a/modules.d/95dasd_mod/installkernel b/modules.d/95dasd_mod/installkernel
deleted file mode 100755
index f8ba37a2..00000000
--- a/modules.d/95dasd_mod/installkernel
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-instmods dasd_mod dasd_eckd_mod dasd_fba_mod dasd_diag_mod
-
-
diff --git a/modules.d/95dasd_mod/module-info.sh b/modules.d/95dasd_mod/module-info.sh
new file mode 100755
index 00000000..0f8700c0
--- /dev/null
+++ b/modules.d/95dasd_mod/module-info.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+check() {
+    arch=$(uname -m)
+    [ "$arch" = "s390" -o "$arch" = "s390x" ] || return 1 
+
+    return 0
+}
+
+depends() {
+    return 0
+}
+
+installkernel() {
+    instmods dasd_mod dasd_eckd_mod dasd_fba_mod dasd_diag_mod
+}
+
+install() {
+    inst_hook cmdline 31 "$moddir/parse-dasd-mod.sh"
+    dracut_install dasd_cio_free grep sed seq
+}
+