From: Jóhann B. Guðmundsson <johannbg@gmail.com>
Date: Tue, 18 May 2021 13:19:28 +0000 (+0000)
Subject: fix(dash): minor cleanups
X-Git-Tag: 055~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4ea5f8734c4636f7d6db78da76e9525beb9a0ac;p=thirdparty%2Fdracut.git

fix(dash): minor cleanups

- Remove hard coded path to binary
- Add missing license header
- Document sections
- refactor install section
---

diff --git a/modules.d/00dash/module-setup.sh b/modules.d/00dash/module-setup.sh
index aa9632105..4a0c0e7e8 100755
--- a/modules.d/00dash/module-setup.sh
+++ b/modules.d/00dash/module-setup.sh
@@ -1,20 +1,32 @@
 #!/bin/bash
+# This file is part of dracut.
+# SPDX-License-Identifier: GPL-2.0-or-later
 
-# called by dracut
+# Prerequisite check(s) for module.
 check() {
-    require_binaries /bin/dash
+
+    # If the binary(s) requirements are not fulfilled the module can't be installed.
+    require_binaries dash || return 1
+
+    # Return 255 to only include the module, if another module requires it.
+    return 255
+
 }
 
-# called by dracut
+# Module dependency requirements.
 depends() {
+
+    # Return 0 to include the dependent module(s) in the initramfs.
     return 0
+
 }
 
-# called by dracut
+# Install the required file(s) and directories for the module in the initramfs.
 install() {
-    # If another shell is already installed, do not use dash
-    [[ -x $initdir/bin/sh ]] && return
 
-    # Prefer dash as /bin/sh if it is available.
-    inst /bin/dash && ln -sf dash "${initdir}/bin/sh"
+    inst /bin/dash
+
+    # Prefer dash as default shell if no other shell is preferred.
+    [[ -L $initdir/bin/sh ]] || ln -sf dash "${initdir}/bin/sh"
+
 }