From: Harald Hoyer <harald@redhat.com>
Date: Thu, 5 Mar 2009 18:12:18 +0000 (+0100)
Subject: /usr/libexec -> /usr/lib
X-Git-Tag: 0.1~359
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=771577a56ad69254af44d9dfc3eee363335183d8;p=thirdparty%2Fdracut.git

/usr/libexec -> /usr/lib
---

diff --git a/Makefile b/Makefile
index c4849e4cc..a40b8ee48 100644
--- 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 fdc2ca0b0..3f68e46f6 100755
--- 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 219fee024..4b09686b1 100644
--- 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