From d022d1bd78675be0fb6ea144ce32076648185e5d6a411bf29c56e11bbc0700dd Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Wed, 9 Oct 2013 11:02:15 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=73 --- dracut.changes | 8 ++++++++ mkinitrd-fix-boot-dir-detection.patch | 16 +++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dracut.changes b/dracut.changes index b8794ea..9d6981c 100644 --- a/dracut.changes +++ b/dracut.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Oct 9 10:59:01 UTC 2013 - tittiatcoke@gmail.com + +- Updated the patch mkinitrd-fix-boot-dir-detection.patch to a + more generic validation that the inidcated initrd file doesn't + contain a path. If no path is given, then add the default + boot_dir. + ------------------------------------------------------------------- Tue Oct 8 18:59:30 UTC 2013 - tittiatcoke@gmail.com diff --git a/mkinitrd-fix-boot-dir-detection.patch b/mkinitrd-fix-boot-dir-detection.patch index 9b6d231..8647bf3 100644 --- a/mkinitrd-fix-boot-dir-detection.patch +++ b/mkinitrd-fix-boot-dir-detection.patch @@ -1,17 +1,19 @@ diff -urNB dracut-033/mkinitrd-dracut.sh new/mkinitrd-dracut.sh --- dracut-033/mkinitrd-dracut.sh 2013-10-04 13:57:15.000000000 +0200 +++ new/mkinitrd-dracut.sh 2013-10-08 20:55:59.280035248 +0200 -@@ -172,7 +172,12 @@ +@@ -172,7 +172,14 @@ ;; -i) read_arg initrd_images "$@" || shift $? for initrd_image in $initrd_images;do - targets="$targets $boot_dir/$initrd_image" -+ case $initrd_image in -+ "$boot_dir"*) -+ targets="$targets $initrd_image";; -+ *) -+ targets="$targets $boot_dir/$initrd_image";; -+ esac ++ # Check if the initrd_image contains a path. ++ # if not, then add the default boot_dir ++ dname=`dirname $initrd_image` ++ if [ "$dname" == "." ]; then ++ targets="$targets $boot_dir/$initrd_image";; ++ else ++ targets="$targets $initrd_image";; ++ fi done ;; *) if [[ ! $targets ]]; then