install dracut-*.service units

diff --git a/Makefile b/Makefile
index 62687727be577d9ef2143a9805854d25056f4d89..fa62cfc92bad37df46096907532158182a0a38b8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,8 +30,7 @@ man8pages = dracut.8 \
             modules.d/98systemd/dracut-pre-mount.service.8 \
             modules.d/98systemd/dracut-pre-pivot.service.8 \
             modules.d/98systemd/dracut-pre-trigger.service.8 \
-            modules.d/98systemd/dracut-pre-udev.service.8 \
-            modules.d/98systemd/udevadm-cleanup-db.service.8
+            modules.d/98systemd/dracut-pre-udev.service.8
 
 manpages = $(man1pages) $(man5pages) $(man7pages) $(man8pages)
 
@@ -114,6 +113,20 @@ endif
                mkdir -p $(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants; \
                ln -s ../dracut-shutdown.service \
                $(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants/dracut-shutdown.service; \
+               mkdir -p $(DESTDIR)$(systemdsystemunitdir)/initrd.target.wants; \
+               for i in \
+                   dracut-cmdline.service \
+                   dracut-initqueue.service \
+                   dracut-mount.service \
+                   dracut-pre-mount.service \
+                   dracut-pre-pivot.service \
+                   dracut-pre-trigger.service \
+                   dracut-pre-udev.service \
+                   ; do \
+                       install -m 0644 modules.d/98systemd/$$i $(DESTDIR)$(systemdsystemunitdir); \
+                       ln -s ../$$i \
+                       $(DESTDIR)$(systemdsystemunitdir)/initrd.target.wants/$i; \
+               done \
        fi
        if [ -f install/dracut-install ]; then \
                install -m 0755 install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \

diff --git a/dracut.spec b/dracut.spec
index 93d497e30d6d04d8f826a83642f26923a9cff5d7..1b0102c7b76bff29eb0449922c382a946884a72d 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -364,6 +364,21 @@ rm -rf $RPM_BUILD_ROOT
 %if %{defined _unitdir}
 %{_unitdir}/dracut-shutdown.service
 %{_unitdir}/shutdown.target.wants/dracut-shutdown.service
+%{_unitdir}/dracut-cmdline.service
+%{_unitdir}/dracut-initqueue.service
+%{_unitdir}/dracut-mount.service
+%{_unitdir}/dracut-pre-mount.service
+%{_unitdir}/dracut-pre-pivot.service
+%{_unitdir}/dracut-pre-trigger.service
+%{_unitdir}/dracut-pre-udev.service
+%{_unitdir}/initrd.target.wants/dracut-cmdline.service
+%{_unitdir}/initrd.target.wants/dracut-initqueue.service
+%{_unitdir}/initrd.target.wants/dracut-mount.service
+%{_unitdir}/initrd.target.wants/dracut-pre-mount.service
+%{_unitdir}/initrd.target.wants/dracut-pre-pivot.service
+%{_unitdir}/initrd.target.wants/dracut-pre-trigger.service
+%{_unitdir}/initrd.target.wants/dracut-pre-udev.service
+
 %endif
 %if 0%{?fedora} || 0%{?rhel} > 6
 %{_prefix}/lib/kernel/install.d/50-dracut.install

diff --git a/modules.d/98systemd/dracut-cmdline.sh b/modules.d/98systemd/dracut-cmdline.sh
index fb306b23d372c034981b2d20fea2132b6a832ea6..ad51142d0134af7d684eefe5dc0b0cd297e7ba68 100755 (executable)
--- a/modules.d/98systemd/dracut-cmdline.sh
+++ b/modules.d/98systemd/dracut-cmdline.sh
@@ -73,6 +73,4 @@ export root rflags fstype netroot NEWROOT
 
 export -p > /dracut-state.sh
 
-service="${0##*/}"
-cp "/etc/systemd/system/${service%.sh}.service" /run/systemd/system/
 exit 0

diff --git a/modules.d/98systemd/dracut-initqueue.sh b/modules.d/98systemd/dracut-initqueue.sh
index 326e203086f36fc3a4fb1c08e3f97f86934e0517..c6fab30717e7fe685766dddf3c3375c723eee8a6 100755 (executable)
--- a/modules.d/98systemd/dracut-initqueue.sh
+++ b/modules.d/98systemd/dracut-initqueue.sh
@@ -72,6 +72,4 @@ unset RDRETRY
 
 export -p > /dracut-state.sh
 
-service="${0##*/}"
-cp "/etc/systemd/system/${service%.sh}.service" /run/systemd/system/
 exit 0

diff --git a/modules.d/98systemd/dracut-mount.sh b/modules.d/98systemd/dracut-mount.sh
index 6cb4519fb32d882c40e618a4213e16aff83a81dc..5f3d9f0bf2d66ef0dd853acda7471fb442809ee2 100755 (executable)
--- a/modules.d/98systemd/dracut-mount.sh
+++ b/modules.d/98systemd/dracut-mount.sh
@@ -36,6 +36,4 @@ done
 
 export -p > /dracut-state.sh
 
-service="${0##*/}"
-cp "/etc/systemd/system/${service%.sh}.service" /run/systemd/system/
 exit 0

diff --git a/modules.d/98systemd/dracut-pre-mount.sh b/modules.d/98systemd/dracut-pre-mount.sh
index cc2aa43a650af650751f1a896a01ad2cde4c080b..55b051abfbe44190b878c3578a620233ed253184 100755 (executable)
--- a/modules.d/98systemd/dracut-pre-mount.sh
+++ b/modules.d/98systemd/dracut-pre-mount.sh
@@ -17,6 +17,4 @@ source_hook pre-mount
 
 export -p > /dracut-state.sh
 
-service="${0##*/}"
-cp "/etc/systemd/system/${service%.sh}.service" /run/systemd/system/
 exit 0

diff --git a/modules.d/98systemd/dracut-pre-pivot.sh b/modules.d/98systemd/dracut-pre-pivot.sh
index 5d47ce219a296e451e3408c18fb4ffad213b005c..63cc9b34313ec741444b564bb619f6b145c1b6b5 100755 (executable)
--- a/modules.d/98systemd/dracut-pre-pivot.sh
+++ b/modules.d/98systemd/dracut-pre-pivot.sh
@@ -25,6 +25,4 @@ getarg rd.break -d rdbreak && emergency_shell -n switch_root "Break before switc
 # remove helper symlink
 [ -h /dev/root ] && rm -f /dev/root
 
-service="${0##*/}"
-cp "/etc/systemd/system/${service%.sh}.service" /run/systemd/system/
 exit 0

diff --git a/modules.d/98systemd/dracut-pre-trigger.sh b/modules.d/98systemd/dracut-pre-trigger.sh
index 4e8e84405a530703e5783ca4b290e4d11f7d5dba..0dbf32a5c023c79ddcbc9129601dd77e7bb542e0 100755 (executable)
--- a/modules.d/98systemd/dracut-pre-trigger.sh
+++ b/modules.d/98systemd/dracut-pre-trigger.sh
@@ -20,6 +20,4 @@ udevadm control --reload >/dev/null 2>&1 || :
 
 export -p > /dracut-state.sh
 
-service="${0##*/}"
-cp "/etc/systemd/system/${service%.sh}.service" /run/systemd/system/
 exit 0

diff --git a/modules.d/98systemd/dracut-pre-udev.sh b/modules.d/98systemd/dracut-pre-udev.sh
index afbd61f0a6c699bfe2b549823aff1c73d42780f6..638da40f6f4118e6005ca337df412fa0bf3320df 100755 (executable)
--- a/modules.d/98systemd/dracut-pre-udev.sh
+++ b/modules.d/98systemd/dracut-pre-udev.sh
@@ -55,6 +55,4 @@ unset _do_insmodpost _modprobe_d
 unset i
 
 export -p > /dracut-state.sh
-service="${0##*/}"
-cp "/etc/systemd/system/${service%.sh}.service" /run/systemd/system/
 exit 0

diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh
index 252074fb5e0b5d2a6d2da09e4666051379f730ed..fc8f09aac43021557d1e349933ac969b78472af7 100755 (executable)
--- a/modules.d/98systemd/module-setup.sh
+++ b/modules.d/98systemd/module-setup.sh
@@ -91,7 +91,22 @@ install() {
         $systemdsystemunitdir/sockets.target.wants/systemd-journald.socket \
         $systemdsystemunitdir/sysinit.target.wants/systemd-udevd.service \
         $systemdsystemunitdir/sysinit.target.wants/systemd-udev-trigger.service \
-\
+        \
+        $systemdsystemunitdir/dracut-cmdline.service \
+        $systemdsystemunitdir/dracut-initqueue.service \
+        $systemdsystemunitdir/dracut-mount.service \
+        $systemdsystemunitdir/dracut-pre-mount.service \
+        $systemdsystemunitdir/dracut-pre-pivot.service \
+        $systemdsystemunitdir/dracut-pre-trigger.service \
+        $systemdsystemunitdir/dracut-pre-udev.service \
+        $systemdsystemunitdir/initrd.target.wants/dracut-cmdline.service \
+        $systemdsystemunitdir/initrd.target.wants/dracut-initqueue.service \
+        $systemdsystemunitdir/initrd.target.wants/dracut-mount.service \
+        $systemdsystemunitdir/initrd.target.wants/dracut-pre-mount.service \
+        $systemdsystemunitdir/initrd.target.wants/dracut-pre-pivot.service \
+        $systemdsystemunitdir/initrd.target.wants/dracut-pre-trigger.service \
+        $systemdsystemunitdir/initrd.target.wants/dracut-pre-udev.service \
+        \
         $systemdsystemunitdir/ctrl-alt-del.target \
         $systemdsystemunitdir/syslog.socket \
         $systemdsystemunitdir/initrd-switch-root.target \
@@ -99,7 +114,7 @@ install() {
         $systemdsystemunitdir/initrd-cleanup.service \
         $systemdsystemunitdir/initrd-udevadm-cleanup-db.service \
         $systemdsystemunitdir/initrd-parse-etc.service \
-\
+        \
         $systemdsystemunitdir/umount.target \
         journalctl systemctl echo swapoff systemd-cgls
 
@@ -160,39 +175,15 @@ install() {
     inst_simple "$moddir/dracut-emergency.service" ${systemdsystemunitdir}/dracut-emergency.service
     inst_simple "$moddir/emergency.service" ${systemdsystemunitdir}/rescue.service
 
-    dracutsystemunitdir="/etc/systemd/system"
-
-    mkdir -p "${initdir}${dracutsystemunitdir}/initrd.target.wants"
-
     ln -fs initrd.target "${initdir}${systemdsystemunitdir}/default.target"
 
     inst_script "$moddir/dracut-cmdline.sh" /bin/dracut-cmdline
-    inst_simple "$moddir/dracut-cmdline.service" ${dracutsystemunitdir}/dracut-cmdline.service
-    ln -fs ../dracut-cmdline.service "${initdir}${dracutsystemunitdir}/initrd.target.wants/dracut-cmdline.service"
-
     inst_script "$moddir/dracut-pre-udev.sh" /bin/dracut-pre-udev
-    inst_simple "$moddir/dracut-pre-udev.service" ${dracutsystemunitdir}/dracut-pre-udev.service
-    ln -fs ../dracut-pre-udev.service "${initdir}${dracutsystemunitdir}/initrd.target.wants/dracut-pre-udev.service"
-
     inst_script "$moddir/dracut-pre-trigger.sh" /bin/dracut-pre-trigger
-    inst_simple "$moddir/dracut-pre-trigger.service" ${dracutsystemunitdir}/dracut-pre-trigger.service
-    ln -fs ../dracut-pre-trigger.service "${initdir}${dracutsystemunitdir}/initrd.target.wants/dracut-pre-trigger.service"
-
     inst_script "$moddir/dracut-initqueue.sh" /bin/dracut-initqueue
-    inst_simple "$moddir/dracut-initqueue.service" ${dracutsystemunitdir}/dracut-initqueue.service
-    ln -fs ../dracut-initqueue.service "${initdir}${dracutsystemunitdir}/initrd.target.wants/dracut-initqueue.service"
-
     inst_script "$moddir/dracut-pre-mount.sh" /bin/dracut-pre-mount
-    inst_simple "$moddir/dracut-pre-mount.service" ${dracutsystemunitdir}/dracut-pre-mount.service
-    ln -fs ../dracut-pre-mount.service "${initdir}${dracutsystemunitdir}/initrd.target.wants/dracut-pre-mount.service"
-
     inst_script "$moddir/dracut-mount.sh" /bin/dracut-mount
-    inst_simple "$moddir/dracut-mount.service" ${dracutsystemunitdir}/dracut-mount.service
-    ln -fs ../dracut-mount.service "${initdir}${dracutsystemunitdir}/initrd.target.wants/dracut-mount.service"
-
     inst_script "$moddir/dracut-pre-pivot.sh" /bin/dracut-pre-pivot
-    inst_simple "$moddir/dracut-pre-pivot.service" ${dracutsystemunitdir}/dracut-pre-pivot.service
-    ln -fs ../dracut-pre-pivot.service "${initdir}${dracutsystemunitdir}/initrd.target.wants/dracut-pre-pivot.service"
 
     inst_rules 99-systemd.rules
 
@@ -203,9 +194,9 @@ install() {
         systemd-ask-password-console.service \
         systemd-ask-password-plymouth.service \
         ; do
-        mkdir -p "${initdir}${dracutsystemunitdir}/${i}.wants"
+        mkdir -p "${initdir}${systemdsystemconfdir}/${i}.wants"
         ln_r "${systemdsystemunitdir}/systemd-vconsole-setup.service" \
-            "${dracutsystemunitdir}/${i}.wants/systemd-vconsole-setup.service"
+            "${systemdsystemconfdir}/${i}.wants/systemd-vconsole-setup.service"
     done
 
     # turn off RateLimit for journal

diff --git a/modules.d/98systemd/udevadm-cleanup-db.service.8.asc b/modules.d/98systemd/udevadm-cleanup-db.service.8.asc
deleted file mode 100644 (file)
index 7837127..0000000
--- a/modules.d/98systemd/udevadm-cleanup-db.service.8.asc
+++ /dev/null
@@ -1,25 +0,0 @@
-UDEVADM-CLEANUP-DB.SERVICE(8)
-=============================
-:doctype: manpage
-:man source:   dracut
-:man manual:   dracut
-
-NAME
-----
-udevadm-cleanup-db.service - clean up the udev database
-
-SYNOPSIS
---------
-udevadm-cleanup-db.service
-
-DESCRIPTION
------------
-Cleans up the udev database for later import in the real root by calling "udevadm info --cleanup-db".
-
-AUTHORS
--------
-Harald Hoyer
-
-SEE ALSO
---------
-*dracut*(8)