feat(dracut-systemd): install dracut-* into /usr/bin

Modern systems have /usr merged and `/bin` pointing to `/usr/bin`. So
install all `dracut-*` scripts into `/usr/bin` instead of `/bin`.

diff --git a/modules.d/98dracut-systemd/dracut-cmdline-ask.service b/modules.d/98dracut-systemd/dracut-cmdline-ask.service
index c9458b74f4c70431bbb010339169b8835823c1db..8b985efaf71fbd5440e7d21be807d934bf1826c3 100644 (file)
--- a/modules.d/98dracut-systemd/dracut-cmdline-ask.service
+++ b/modules.d/98dracut-systemd/dracut-cmdline-ask.service
@@ -19,7 +19,7 @@ Conflicts=shutdown.target emergency.target
 Environment=DRACUT_SYSTEMD=1
 Environment=NEWROOT=/sysroot
 Type=oneshot
-ExecStart=-/bin/dracut-cmdline-ask
+ExecStart=-/usr/bin/dracut-cmdline-ask
 StandardInput=tty
 StandardOutput=inherit
 StandardError=inherit

diff --git a/modules.d/98dracut-systemd/dracut-cmdline.service b/modules.d/98dracut-systemd/dracut-cmdline.service
index ed71d5805b165234f72265f7b6b6d2720525d97f..f5d5a61d0f202bad112409e6868c01307f56cdca 100644 (file)
--- a/modules.d/98dracut-systemd/dracut-cmdline.service
+++ b/modules.d/98dracut-systemd/dracut-cmdline.service
@@ -19,7 +19,7 @@ Conflicts=shutdown.target emergency.target
 Environment=DRACUT_SYSTEMD=1
 Environment=NEWROOT=/sysroot
 Type=oneshot
-ExecStart=-/bin/dracut-cmdline
+ExecStart=-/usr/bin/dracut-cmdline
 StandardInput=null
 StandardError=journal+console
 KillMode=process

diff --git a/modules.d/98dracut-systemd/dracut-emergency.service b/modules.d/98dracut-systemd/dracut-emergency.service
index eb3e67f658e844a93dbc010852a6c6e5c468bbe7..fd8e9cc9482e474ce61d1da2534c8a3319af6b4e 100644 (file)
--- a/modules.d/98dracut-systemd/dracut-emergency.service
+++ b/modules.d/98dracut-systemd/dracut-emergency.service
@@ -13,7 +13,7 @@ Environment=HOME=/
 Environment=DRACUT_SYSTEMD=1
 Environment=NEWROOT=/sysroot
 WorkingDirectory=/
-ExecStart=-/bin/dracut-emergency
+ExecStart=-/usr/bin/dracut-emergency
 ExecStopPost=-/bin/rm -f -- /.console_lock
 Type=oneshot
 StandardInput=tty-force

diff --git a/modules.d/98dracut-systemd/dracut-initqueue.service b/modules.d/98dracut-systemd/dracut-initqueue.service
index 4cd32ebaa00ccd771b8af7c9a65925780c9293a7..22dcd7da510094f8ed150f1bc95acf767dff9e3b 100644 (file)
--- a/modules.d/98dracut-systemd/dracut-initqueue.service
+++ b/modules.d/98dracut-systemd/dracut-initqueue.service
@@ -17,7 +17,7 @@ Conflicts=shutdown.target emergency.target
 Environment=DRACUT_SYSTEMD=1
 Environment=NEWROOT=/sysroot
 Type=oneshot
-ExecStart=-/bin/dracut-initqueue
+ExecStart=-/usr/bin/dracut-initqueue
 StandardInput=null
 StandardError=journal+console
 KillMode=process

diff --git a/modules.d/98dracut-systemd/dracut-mount.service b/modules.d/98dracut-systemd/dracut-mount.service
index 27fff8214db5cb24794cf952eb01614ff43845cf..f3a91918dccf6e31dd4768fb23c57f5073af9d80 100644 (file)
--- a/modules.d/98dracut-systemd/dracut-mount.service
+++ b/modules.d/98dracut-systemd/dracut-mount.service
@@ -15,7 +15,7 @@ Conflicts=shutdown.target emergency.target
 Environment=DRACUT_SYSTEMD=1
 Environment=NEWROOT=/sysroot
 Type=oneshot
-ExecStart=-/bin/dracut-mount
+ExecStart=-/usr/bin/dracut-mount
 StandardInput=null
 StandardError=journal+console
 KillMode=process

diff --git a/modules.d/98dracut-systemd/dracut-pre-mount.service b/modules.d/98dracut-systemd/dracut-pre-mount.service
index 351370b7ddcf9e970715da507a4580ba881cd74c..f55cd51fb51e7377c92218bc9e25b22b579e4d3c 100644 (file)
--- a/modules.d/98dracut-systemd/dracut-pre-mount.service
+++ b/modules.d/98dracut-systemd/dracut-pre-mount.service
@@ -15,7 +15,7 @@ Conflicts=shutdown.target emergency.target
 Environment=DRACUT_SYSTEMD=1
 Environment=NEWROOT=/sysroot
 Type=oneshot
-ExecStart=-/bin/dracut-pre-mount
+ExecStart=-/usr/bin/dracut-pre-mount
 StandardInput=null
 StandardError=journal+console
 KillMode=process

diff --git a/modules.d/98dracut-systemd/dracut-pre-pivot.service b/modules.d/98dracut-systemd/dracut-pre-pivot.service
index 04a3705e71fd935c791c2e54d362170893954789..daedd7c96dbca4cc5fb0772c2b922cec68a9a15b 100644 (file)
--- a/modules.d/98dracut-systemd/dracut-pre-pivot.service
+++ b/modules.d/98dracut-systemd/dracut-pre-pivot.service
@@ -23,7 +23,7 @@ Conflicts=shutdown.target emergency.target
 Environment=DRACUT_SYSTEMD=1
 Environment=NEWROOT=/sysroot
 Type=oneshot
-ExecStart=-/bin/dracut-pre-pivot
+ExecStart=-/usr/bin/dracut-pre-pivot
 StandardInput=null
 StandardError=journal+console
 KillMode=process

diff --git a/modules.d/98dracut-systemd/dracut-pre-trigger.service b/modules.d/98dracut-systemd/dracut-pre-trigger.service
index 374cd3a98392f29055bf7e8f84e715938d3f2402..83923bc710603d822421e3841820027cf1ce158f 100644 (file)
--- a/modules.d/98dracut-systemd/dracut-pre-trigger.service
+++ b/modules.d/98dracut-systemd/dracut-pre-trigger.service
@@ -16,7 +16,7 @@ Conflicts=shutdown.target emergency.target
 Environment=DRACUT_SYSTEMD=1
 Environment=NEWROOT=/sysroot
 Type=oneshot
-ExecStart=-/bin/dracut-pre-trigger
+ExecStart=-/usr/bin/dracut-pre-trigger
 StandardInput=null
 StandardError=journal+console
 KillMode=process

diff --git a/modules.d/98dracut-systemd/dracut-pre-udev.service b/modules.d/98dracut-systemd/dracut-pre-udev.service
index a61e9d4f3aafc10ad737a801e5856f7104c68ef2..316fe005df3444a31db91e7e644d39fd16fe34f1 100644 (file)
--- a/modules.d/98dracut-systemd/dracut-pre-udev.service
+++ b/modules.d/98dracut-systemd/dracut-pre-udev.service
@@ -20,7 +20,7 @@ Conflicts=shutdown.target emergency.target
 Environment=DRACUT_SYSTEMD=1
 Environment=NEWROOT=/sysroot
 Type=oneshot
-ExecStart=-/bin/dracut-pre-udev
+ExecStart=-/usr/bin/dracut-pre-udev
 StandardInput=null
 StandardError=journal+console
 KillMode=process

diff --git a/modules.d/98dracut-systemd/emergency.service b/modules.d/98dracut-systemd/emergency.service
index 27c69e149ee51d2e914d7bd642ed31e7cce2f012..8159f93e1e867421b8f08dfdcdc629f45d6f1fb2 100644 (file)
--- a/modules.d/98dracut-systemd/emergency.service
+++ b/modules.d/98dracut-systemd/emergency.service
@@ -14,7 +14,7 @@ Environment=HOME=/
 Environment=DRACUT_SYSTEMD=1
 Environment=NEWROOT=/sysroot
 WorkingDirectory=/
-ExecStart=/bin/dracut-emergency
+ExecStart=/usr/bin/dracut-emergency
 ExecStopPost=-/usr/bin/systemctl --fail --no-block default
 Type=idle
 StandardInput=tty-force

diff --git a/modules.d/98dracut-systemd/module-setup.sh b/modules.d/98dracut-systemd/module-setup.sh
index f2502cd7852a811b4fcd706fafcf162cd91db397..1c139d5605ce0b8751e44d6f80daa2765f3fa63d 100755 (executable)
--- a/modules.d/98dracut-systemd/module-setup.sh
+++ b/modules.d/98dracut-systemd/module-setup.sh
@@ -31,21 +31,21 @@ depends() {
 
 # called by dracut
 install() {
-    inst_script "$moddir/dracut-emergency.sh" /bin/dracut-emergency
+    inst_script "$moddir/dracut-emergency.sh" /usr/bin/dracut-emergency
     inst_simple "$moddir/emergency.service" "${systemdsystemunitdir}"/emergency.service
     inst_simple "$moddir/dracut-emergency.service" "${systemdsystemunitdir}"/dracut-emergency.service
     inst_simple "$moddir/emergency.service" "${systemdsystemunitdir}"/rescue.service
 
     ln_r "${systemdsystemunitdir}/initrd.target" "${systemdsystemunitdir}/default.target"
 
-    inst_script "$moddir/dracut-cmdline.sh" /bin/dracut-cmdline
-    inst_script "$moddir/dracut-cmdline-ask.sh" /bin/dracut-cmdline-ask
-    inst_script "$moddir/dracut-pre-udev.sh" /bin/dracut-pre-udev
-    inst_script "$moddir/dracut-pre-trigger.sh" /bin/dracut-pre-trigger
-    inst_script "$moddir/dracut-initqueue.sh" /bin/dracut-initqueue
-    inst_script "$moddir/dracut-pre-mount.sh" /bin/dracut-pre-mount
-    inst_script "$moddir/dracut-mount.sh" /bin/dracut-mount
-    inst_script "$moddir/dracut-pre-pivot.sh" /bin/dracut-pre-pivot
+    inst_script "$moddir/dracut-cmdline.sh" /usr/bin/dracut-cmdline
+    inst_script "$moddir/dracut-cmdline-ask.sh" /usr/bin/dracut-cmdline-ask
+    inst_script "$moddir/dracut-pre-udev.sh" /usr/bin/dracut-pre-udev
+    inst_script "$moddir/dracut-pre-trigger.sh" /usr/bin/dracut-pre-trigger
+    inst_script "$moddir/dracut-initqueue.sh" /usr/bin/dracut-initqueue
+    inst_script "$moddir/dracut-pre-mount.sh" /usr/bin/dracut-pre-mount
+    inst_script "$moddir/dracut-mount.sh" /usr/bin/dracut-mount
+    inst_script "$moddir/dracut-pre-pivot.sh" /usr/bin/dracut-pre-pivot
 
     inst_script "$moddir/rootfs-generator.sh" "$systemdutildir"/system-generators/dracut-rootfs-generator