forked from pool/libguestfs
- Workaround bug in patch(1) which does not follow symlinks anymore
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=334
This commit is contained in:
parent
995f04f76d
commit
dad1f5daa7
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 9 13:58:47 UTC 2015 - ohering@suse.de
|
||||
|
||||
- Workaround bug in patch(1) which does not follow symlinks anymore
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 24 09:43:58 UTC 2015 - ohering@suse.de
|
||||
|
||||
|
@ -731,6 +731,7 @@ a \
|
||||
' mkinitrd/scripts/boot-guestfs.sh
|
||||
diff -u mkinitrd/scripts/boot-guestfs.sh~ mkinitrd/scripts/boot-guestfs.sh || :
|
||||
#
|
||||
pushd mkinitrd
|
||||
patched=
|
||||
for p in \
|
||||
%{S:1310} \
|
||||
@ -742,17 +743,18 @@ for p in \
|
||||
%{S:1110} \
|
||||
;
|
||||
do
|
||||
if patch --dry-run -p1 < $p
|
||||
if patch --dry-run -p2 < $p
|
||||
then
|
||||
patch -p1 < $p
|
||||
patch -p2 < $p
|
||||
patched=$p
|
||||
break
|
||||
elif patch --dry-run -R -p1 < $p
|
||||
elif patch --dry-run -R -p2 < $p
|
||||
then
|
||||
patched=$p
|
||||
break
|
||||
fi
|
||||
done
|
||||
popd
|
||||
test -n "$patched"
|
||||
|
||||
./mkinitrd_setup.sh \
|
||||
|
Loading…
x
Reference in New Issue
Block a user