systemd: use systemd in the initramfs, if installed on the system

and systemd version is >= 198

diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh
index 761cda6af398ca069d83e4068f2d5096b5f7540f..8775fd230b5f5b56870ea81c23a6d474789d6ee5 100755 (executable)
--- a/modules.d/98systemd/module-setup.sh
+++ b/modules.d/98systemd/module-setup.sh
@@ -5,6 +5,8 @@
 check() {
     [[ $mount_needs ]] && return 1
     if [[ -x $systemdutildir/systemd ]]; then
+        SYSTEMD_VERSION=$($systemdutildir/systemd --version | { read a b a; echo $b; })
+        (( $SYSTEMD_VERSION >= 198 )) && return 0
        return 255
     fi
 

diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
index e7466df851b9b939337f167264b846ae148bc7e8..c9ee838806e40f385e9772769ffa44d568db822b 100755 (executable)
--- a/modules.d/99base/module-setup.sh
+++ b/modules.d/99base/module-setup.sh
@@ -8,7 +8,6 @@ check() {
 
 depends() {
     echo udev-rules
-    systemctl --system --no-pager &>/dev/null && echo systemd
     return 0
 }