[patch] fix switch_root issue

dracut-002-use-embedded-switch_root.patch (text/plain), 1.56 KB, created by Ambroz Bizjak on 2009-11-14 15:21:48 UTC

diff -urN dracut-002.orig/Makefile dracut-002/Makefile
--- dracut-002.orig/Makefile	2009-11-14 15:56:24.316701215 +0100
+++ dracut-002/Makefile	2009-11-14 15:57:17.854705196 +0100
@@ -24,12 +24,10 @@
 	install -m 0755 dracut $(DESTDIR)$(sbindir)/dracut
 	install -m 0755 dracut-gencmdline $(DESTDIR)$(sbindir)/dracut-gencmdline
 	install -m 0755 dracut-catimages $(DESTDIR)$(sbindir)/dracut-catimages
-	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)
 	install -m 0644 dracut.8 $(DESTDIR)$(mandir)/man8
-	rm $(DESTDIR)$(pkglibdir)/modules.d/99base/switch_root
 
 clean:
 	rm -f *~
diff -urN dracut-002.orig/modules.d/99base/install dracut-002/modules.d/99base/install
--- dracut-002.orig/modules.d/99base/install	2009-11-14 15:56:24.308702193 +0100
+++ dracut-002/modules.d/99base/install	2009-11-14 15:57:45.268704149 +0100
@@ -13,12 +13,8 @@
 mkdir -p ${initdir}/initqueue-settled
 mkdir -p ${initdir}/tmp
 # Bail out if switch_root does not exist
-if which switch_root >/dev/null 2>&1; then
-    dracut_install switch_root 
-else
-    inst "$moddir/switch_root" "/sbin/switch_root" \
-	|| derror "Failed to install switch_root"
-fi
+inst "$moddir/switch_root" "/sbin/switch_root" \
+    || derror "Failed to install switch_root"
 inst "$moddir/dracut-lib.sh" "/lib/dracut-lib.sh"
 inst_hook cmdline 10 "$moddir/parse-root-opts.sh"
 inst_hook cmdline 20 "$moddir/parse-blacklist.sh"