projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not fail in multiarch environment when installing libnss_dns.so.
[live-boot-grml.git]
/
debian
/
patches
/
12_uuid_support.dpatch
diff --git
a/debian/patches/12_uuid_support.dpatch
b/debian/patches/12_uuid_support.dpatch
index
364c5b3
..
3d60325
100755
(executable)
--- a/
debian/patches/12_uuid_support.dpatch
+++ b/
debian/patches/12_uuid_support.dpatch
@@
-54,7
+54,7
@@
index abce3cd..851796c 100755
+ fi
+
+ if [ -n "$BOOTID" ] && ! [ -r "${path}/conf/bootid.txt" ] ; then
+ fi
+
+ if [ -n "$BOOTID" ] && ! [ -r "${path}/conf/bootid.txt" ] ; then
-+ echo " * Warning: bootid=... specified but no bootid.txt found on currently requested device.">>/live.log
++ echo " * Warning: bootid=... specified but no bootid.txt found on currently requested device.">>/live
-boot
.log
+ return 1
+ fi
+
+ return 1
+ fi
+
@@
-64,15
+64,15
@@
index abce3cd..851796c 100755
+
+ if [ -z "$BOOTID" -a -z "$IGNORE_BOOTID" ]
+ then
+
+ if [ -z "$BOOTID" -a -z "$IGNORE_BOOTID" ]
+ then
-+ echo " * Warning: bootid.txt found but ignore_bootid / bootid=.. bootoption missing...">>/live.log
++ echo " * Warning: bootid.txt found but ignore_bootid / bootid=.. bootoption missing...">>/live
-boot
.log
+ return 1
+ fi
+
+ if [ "$BOOTID" = "$bootid_conf" ]
+ then
+ return 1
+ fi
+
+ if [ "$BOOTID" = "$bootid_conf" ]
+ then
-+ echo " * Successfully verified /conf/bootid.txt from ISO, continuing... ">>/live.log
++ echo " * Successfully verified /conf/bootid.txt from ISO, continuing... ">>/live
-boot
.log
+ else
+ else
-+ echo " * Warning: BOOTID of ISO does not match. Retrying and continuing search...">>/live.log
++ echo " * Warning: BOOTID of ISO does not match. Retrying and continuing search...">>/live
-boot
.log
+ return 1
+ fi
+
+ return 1
+ fi
+