- rel 4; fix fallback

diff --git a/geninitrd-git.patch b/geninitrd-git.patch
index 90d528abe80adda6c9aec88cbfb499d9b0643a18..30660b5a0b5dcf079aff1e0c71b93bbaa787ad73 100644 (file)
--- a/geninitrd-git.patch
+++ b/geninitrd-git.patch
@@ -34,3 +34,25 @@ index a0cd7aa..d9093d4 100644
                        # FIXME: find and copy partition devices from /proc/partitions
                        #        - best if done at runtime, now initrd gen time
                        continue
+commit 11202855dbaee5bc32209913df1ae8738c210c39
+Author: Arkadiusz Miśkiewicz <arekm@maven.pl>
+Date:   Sat May 14 00:36:02 2016 +0200
+
+    Make rootdev fallback work.
+
+diff --git a/geninitrd b/geninitrd
+index 92a519d..771245e 100755
+--- a/geninitrd
++++ b/geninitrd
+@@ -1004,7 +1004,11 @@ initrd_gen_initramfs_switchroot() {
+ 
+               # XXX hack, fallback to rootdev from geninitrd time
+               if [ ! -e "$device" ]; then
++      EOF
++      add_linuxrc <<-EOF
+                       device="$rootdev"
++      EOF
++      add_linuxrc <<-'EOF'
+                       echo "DEVICE set to $device based on fstab entry from initrd gen time"
+               fi
+ 

diff --git a/geninitrd.spec b/geninitrd.spec
index 269191f3785d7a3a381a8bd12e9e9f031a1ccff7..d45d8f83c686cc84af89e9aeb73de1036e1d1003 100644 (file)
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -7,7 +7,7 @@ Summary:        Creates an initial ramdisk image for preloading modules
 Summary(pl.UTF-8):     Narzędzie do tworzenia inicjalnego ramdysku używanego przy starcie systemu
 Name:          geninitrd
 Version:       12757
-Release:       3
+Release:       4
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.gz