Hello community,

here is the log from the commit of package dracut for openSUSE:Factory checked 
in at 2013-10-09 09:43:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dracut (Old)
 and      /work/SRC/openSUSE:Factory/.dracut.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "dracut"

Changes:
--------
--- /work/SRC/openSUSE:Factory/dracut/dracut.changes    2013-10-07 
15:49:10.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes       2013-10-09 
09:43:38.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Oct  8 18:59:30 UTC 2013 - tittiatc...@gmail.com
+
+- Fix again the mkinitrd script as that people don't seem to test.
+  Added mkinitrd-fix-boot-dir-detection.patch so that an initrd 
+  is created.
+
+-------------------------------------------------------------------

Old:
----
  mkinitrd_allow_multiple_args.patch

New:
----
  mkinitrd-fix-boot-dir-detection.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ dracut.spec ++++++
--- /var/tmp/diff_new_pack.zBDayy/_old  2013-10-09 09:43:46.000000000 +0200
+++ /var/tmp/diff_new_pack.zBDayy/_new  2013-10-09 09:43:46.000000000 +0200
@@ -48,6 +48,8 @@
 Patch4:         suse_only_logger.patch
 # PATCH-FIX-OPENSUSE Call the update-bootloader after dracut finished creating 
the initrd - tittiatc...@gmail.com
 Patch5:         mkinitrd_update_bootloader.diff
+# PATCH-FIX-OPENSUSE Validate the initrd parameter first, before just blindly 
add the boot_dir parameter in front of it
+Patch6:         mkinitrd-fix-boot-dir-detection.patch
 
 BuildRequires:  bash
 BuildRequires:  dash
@@ -127,6 +129,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %configure\

++++++ mkinitrd-fix-boot-dir-detection.patch ++++++
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 @@
            ;;
        -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
            done
            ;;
         *)  if [[ ! $targets ]]; then
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to