From 3d5cee3e1e9233faa450ac0e49de7438e1780a33ce145701feeaf6ef8f342812 Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Fri, 28 Sep 2012 12:43:54 +0000
Subject: [PATCH] move sles11 fixes

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=120
---
 libguestfs.mkinitrd.1110.patch | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/libguestfs.mkinitrd.1110.patch b/libguestfs.mkinitrd.1110.patch
index 760278b..6819fae 100644
--- a/libguestfs.mkinitrd.1110.patch
+++ b/libguestfs.mkinitrd.1110.patch
@@ -1,7 +1,7 @@
 ---
  mkinitrd/scripts/setup-prepare.sh |   94 +++++++++++++++++++++++++++++++-------
- mkinitrd/scripts/setup-progs.sh   |    8 +--
- 2 files changed, 80 insertions(+), 22 deletions(-)
+ mkinitrd/scripts/setup-progs.sh   |    4 -
+ 2 files changed, 79 insertions(+), 19 deletions(-)
 
 Index: 1110/mkinitrd/scripts/setup-prepare.sh
 ===================================================================
@@ -160,13 +160,7 @@ Index: 1110/mkinitrd/scripts/setup-progs.sh
 ===================================================================
 --- 1110.orig/mkinitrd/scripts/setup-progs.sh
 +++ 1110/mkinitrd/scripts/setup-progs.sh
-@@ -22,35 +22,33 @@ for script in $INITRD_PATH/boot/*.sh; do
-         # echo "[ -e "config/${file#*-}" ] && . \"config/${file#*-}\"" >> run_all.sh
-         # -- check if we should run the module
-         condition="$(sed -n 's/^#%if:\(.*\)$/if [ \1 ]; then/p' "$script")"
-           echo "$condition" >> run_all.sh
-           # -- remember dependent modules
-           sed -n 's/^#%modules:\(.*\)$/modules="\1"/p' $script >> run_all.sh
+@@ -28,29 +28,29 @@ for script in $INITRD_PATH/boot/*.sh; do
            echo "[ \"\$debug\" ] && echo running $file
  source boot/$file
  [ \"\$modules\" ] && load_modules" >> run_all.sh
@@ -174,17 +168,16 @@ Index: 1110/mkinitrd/scripts/setup-progs.sh
          # and all programs it needs
          for files in $(cat $script | grep '%programs: ' | sed 's/^#%programs: \(.*\)$/\1/'); do
              for file in $(eval echo $files); do
-+                SOURCE=$file
                  if [ "${file:0:17}" = "/lib/mkinitrd/bin" ]; then
--                        SOURCE=$file
+                         SOURCE=$file
                          DEST="./bin/"
                  elif [ "${file:0:1}" = "/" ]; then # absolute path files have to stay alive
--                        SOURCE=$file
+                         SOURCE=$file
                          [ ! -e $file -a -e /usr$file ] && SOURCE="/usr$file"
 -                        DEST=".$file"
 +                        DEST=".$SOURCE"
                  else
--                        SOURCE=$(which "$file")
+                         SOURCE=$(which "$file")
 -                        DEST="./bin/"
 +                        DEST=".$SOURCE"
                  fi