From f9045633655dbc1c8f7ffc6521cb8d0aa9733ba6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sat, 14 May 2016 00:37:04 +0200 Subject: [PATCH] - rel 4; fix fallback --- geninitrd-git.patch | 22 ++++++++++++++++++++++ geninitrd.spec | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/geninitrd-git.patch b/geninitrd-git.patch index 90d528a..30660b5 100644 --- 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 +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 269191f..d45d8f8 100644 --- 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 -- 2.44.0