projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Append nameservers provided via dns bootoption into initramfs resolv.conf
[live-boot-grml.git]
/
debian
/
patches
/
12_uuid_support.patch
diff --git
a/debian/patches/12_uuid_support.patch
b/debian/patches/12_uuid_support.patch
index
34cee3d
..
f241bba
100644
(file)
--- a/
debian/patches/12_uuid_support.patch
+++ b/
debian/patches/12_uuid_support.patch
@@
-12,8
+12,10
@@
## DP: * no bootid.txt + ignore_bootid=... => boots
@DPATCH@
## DP: * no bootid.txt + ignore_bootid=... => boots
@DPATCH@
---- a/scripts/live
-+++ b/scripts/live
+Index: live-boot-grml/scripts/live
+===================================================================
+--- live-boot-grml.orig/scripts/live 2011-12-06 22:10:24.000000000 +0100
++++ live-boot-grml/scripts/live 2011-12-06 22:10:25.000000000 +0100
@@ -63,6 +63,11 @@
export ACCESS
;;
@@ -63,6 +63,11 @@
export ACCESS
;;
@@
-38,7
+40,7
@@
ignore_uuid)
IGNORE_UUID="Yes"
export IGNORE_UUID
ignore_uuid)
IGNORE_UUID="Yes"
export IGNORE_UUID
-@@ -4
10,6 +420
,42 @@
+@@ -4
57,6 +467
,42 @@
return 1
}
return 1
}
@@
-81,7
+83,7
@@
matches_uuid ()
{
if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]
matches_uuid ()
{
if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]
-@@ -1
655,7 +170
1,7 @@
+@@ -1
785,7 +183
1,7 @@
fi
if is_live_path ${mountpoint} && \
fi
if is_live_path ${mountpoint} && \
@@
-90,7
+92,7
@@
then
echo ${mountpoint}
return 0
then
echo ${mountpoint}
return 0
-@@ -1
769,19 +1815
,6 @@
+@@ -1
881,19 +1927
,6 @@
return 0
fi
done
return 0
fi
done