forked from pool/libguestfs
fix SOURCE handling, broken by previous commit
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=118
This commit is contained in:
parent
091ceda4ba
commit
106a7548c9
@ -1,7 +1,7 @@
|
||||
---
|
||||
mkinitrd/scripts/setup-prepare.sh | 94 +++++++++++++++++++++++++++++++-------
|
||||
mkinitrd/scripts/setup-progs.sh | 5 --
|
||||
2 files changed, 79 insertions(+), 20 deletions(-)
|
||||
mkinitrd/scripts/setup-progs.sh | 8 +--
|
||||
2 files changed, 80 insertions(+), 22 deletions(-)
|
||||
|
||||
Index: 1110/mkinitrd/scripts/setup-prepare.sh
|
||||
===================================================================
|
||||
@ -160,7 +160,13 @@ Index: 1110/mkinitrd/scripts/setup-progs.sh
|
||||
===================================================================
|
||||
--- 1110.orig/mkinitrd/scripts/setup-progs.sh
|
||||
+++ 1110/mkinitrd/scripts/setup-progs.sh
|
||||
@@ -28,29 +28,28 @@ for script in $INITRD_PATH/boot/*.sh; do
|
||||
@@ -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
|
||||
echo "[ \"\$debug\" ] && echo running $file
|
||||
source boot/$file
|
||||
[ \"\$modules\" ] && load_modules" >> run_all.sh
|
||||
@ -168,11 +174,12 @@ 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"
|
||||
|
Loading…
x
Reference in New Issue
Block a user