/usr/libexec -> /usr/lib

diff --git a/Makefile b/Makefile
index c4849e4ccccb8e7a5f69cefbcdef36623b0fe686..a40b8ee48fff80f4a13ba5d38768f3120df8f942 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,14 +7,14 @@ modules.d/99base/switch_root: switch_root.c
 all: modules.d/99base/switch_root
 
 install:
-       mkdir -p $(DESTDIR)/usr/libexec/dracut
+       mkdir -p $(DESTDIR)/usr/lib/dracut
        mkdir -p $(DESTDIR)/sbin
        mkdir -p $(DESTDIR)/etc
-       mkdir -p $(DESTDIR)/usr/libexec/dracut/modules.d
+       mkdir -p $(DESTDIR)/usr/lib/dracut/modules.d
        install -m 0755 dracut $(DESTDIR)/sbin/dracut
        install -m 0644 dracut.conf $(DESTDIR)/etc/dracut.conf
-       install -m 0755 dracut-functions $(DESTDIR)/usr/libexec/dracut/dracut-functions
-       cp -arx modules.d $(DESTDIR)/usr/libexec/dracut/
+       install -m 0755 dracut-functions $(DESTDIR)/usr/lib/dracut/dracut-functions
+       cp -arx modules.d $(DESTDIR)/usr/lib/dracut/
 
 clean:
        rm -f *~

diff --git a/dracut b/dracut
index fdc2ca0b0cdbb57222997dfdd0fc285ac984e63d..3f68e46f6e0618db0ff6df600841b492b6ccf75c 100755 (executable)
--- a/dracut
+++ b/dracut
@@ -43,7 +43,7 @@ if [[ -f $outfile && ! $force ]]; then
     exit 1
 fi
 
-[[ $allowlocal && -f dracut-functions ]] && dsrc="." || dsrc=/usr/libexec/dracut
+[[ $allowlocal && -f dracut-functions ]] && dsrc="." || dsrc=/usr/lib/dracut
 . $dsrc/dracut-functions
 
 hookdirs="pre-udev pre-mount pre-pivot mount"

diff --git a/dracut.spec b/dracut.spec
index 219fee024b8895cef4c15de4c5dfe417ef976e27..4b09686b1e29f453672ac20e062d60a7379685c7 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -63,9 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/mkinitrd
 /usr/libexec/initrd-functions
 %endif
-%dir /usr/libexec/dracut
-/usr/libexec/dracut/dracut-functions
-/usr/libexec/dracut/modules.d
+%dir /usr/lib/dracut
+/usr/lib/dracut/dracut-functions
+/usr/lib/dracut/modules.d
 %config(noreplace) /etc/dracut.conf