specfile update

diff --git a/Makefile b/Makefile
index eaaf144814ec1dbeaa35ce28ca5022f6cdc2a0b1..491d156857159ef9a4c484be2515c200b1ea57a8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,9 +20,11 @@ install:
        mkdir -p $(DESTDIR)$(sysconfdir)
        mkdir -p $(DESTDIR)$(pkglibdir)/modules.d
        install -m 0755 dracut $(DESTDIR)$(sbindir)/dracut
+       install -m 0755 modules.d/99base/switch_root $(DESTDIR)$(sbindir)/switch_root
        install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf
        install -m 0755 dracut-functions $(DESTDIR)$(pkglibdir)/dracut-functions
        cp -arx modules.d $(DESTDIR)$(pkglibdir)
+       rm $(DESTDIR)$(pkglibdir)/modules.d/99base/switch_root
 
 clean:
        rm -f *~

diff --git a/dracut.spec b/dracut.spec
index f0cfcb7a0b9065fc58e6d03cd5062401426f3dbb..b94275daf2cfb6632ba7a8d8bb1917589071f53a 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -43,13 +43,16 @@ make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin sysconfdir=/etc
 
 %if 0%{?replace_mkinitrd}
 ln -s dracut $RPM_BUILD_ROOT/sbin/mkinitrd
 ln -s dracut/dracut-functions $RPM_BUILD_ROOT/usr/libexec/initrd-functions
 %endif
 
+#mkdir -p $RPM_BUILD_ROOT/sbin
+#mv $RPM_BUILD_ROOT/%{_prefix}/lib/dracut/modules.d/99base/switch_root $RPM_BUILD_ROOT/sbin
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -57,13 +60,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc README HACKING TODO COPYING
 /sbin/dracut
+/sbin/switch_root
 %if 0%{?replace_mkinitrd}
 /sbin/mkinitrd
 /usr/libexec/initrd-functions
 %endif
-%dir /usr/lib/dracut
-/usr/lib/dracut/dracut-functions
-/usr/lib/dracut/modules.d
+%dir %{_prefix}/lib/dracut
+%{_prefix}/lib/dracut/dracut-functions
+%{_prefix}/lib/dracut/modules.d
 %config(noreplace) /etc/dracut.conf