pool/dracut
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 203116 from Base:System

Browse Source 
Just for Factory :)

OBS-URL: https://build.opensuse.org/request/show/203116
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dracut?expand=0&rev=24
This commit is contained in:
Tomáš Chvátal 2013-10-14 07:24:44 +00:00 committed by Git OBS Bridge
commit 9fa0ed96da
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dracut.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Sun Oct 13 15:25:37 UTC 2013 - tittiatcoke@gmail.com
- Correct patch mkinitrd-fix-boot-dir-detection. (";;" doesn't
really work)
-------------------------------------------------------------------
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 Tue Oct 8 18:59:30 UTC 2013 - tittiatcoke@gmail.com

16
mkinitrd-fix-boot-dir-detection.patch
View File

@ -1,17 +1,19 @@
diff -urNB dracut-033/mkinitrd-dracut.sh new/mkinitrd-dracut.sh diff -urNB dracut-033/mkinitrd-dracut.sh new/mkinitrd-dracut.sh
--- dracut-033/mkinitrd-dracut.sh 2013-10-04 13:57:15.000000000 +0200 --- 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 +++ 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 $? -i) read_arg initrd_images "$@" || shift $?
for initrd_image in $initrd_images;do for initrd_image in $initrd_images;do
- targets="$targets $boot_dir/$initrd_image" - targets="$targets $boot_dir/$initrd_image"
+ case $initrd_image in + # Check if the initrd_image contains a path.
+ "$boot_dir"*) + # if not, then add the default boot_dir
+ targets="$targets $initrd_image";; + dname=`dirname $initrd_image`
+ *) + if [ "$dname" == "." ]; then
+ targets="$targets $boot_dir/$initrd_image";; + targets="$targets $boot_dir/$initrd_image";
+ esac + else
+ targets="$targets $initrd_image";
+ fi
done done
;; ;;
*) if [[ ! $targets ]]; then *) if [[ ! $targets ]]; then