projects
/
live-boot-grml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2130827
)
refresh debian/patches/12_uuid_support.patch
author
Evgeni Golov
<evgeni@grml.org>
Thu, 15 Aug 2013 06:01:26 +0000
(08:01 +0200)
committer
Evgeni Golov
<evgeni@grml.org>
Thu, 15 Aug 2013 06:01:26 +0000
(08:01 +0200)
debian/patches/12_uuid_support.patch
patch
|
blob
|
history
diff --git
a/debian/patches/12_uuid_support.patch
b/debian/patches/12_uuid_support.patch
index
ed51916
..
810e811
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/boot/9990-misc-helpers.sh
-+++ b/scripts/boot/9990-misc-helpers.sh
+Index: live-boot-grml/scripts/boot/9990-misc-helpers.sh
+===================================================================
+--- live-boot-grml.orig/scripts/boot/9990-misc-helpers.sh 2013-08-15 08:01:04.303981714 +0200
++++ live-boot-grml/scripts/boot/9990-misc-helpers.sh 2013-08-15 08:01:04.299981714 +0200
@@ -20,6 +20,42 @@
return 1
}
@@ -20,6 +20,42 @@
return 1
}
@@
-57,7
+59,7
@@
matches_uuid ()
{
if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]
matches_uuid ()
{
if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]
-@@ -2
47,7 +283
,7 @@
+@@ -2
19,7 +255
,7 @@
fi
if is_live_path ${mountpoint} && \
fi
if is_live_path ${mountpoint} && \
@@
-66,7
+68,7
@@
then
echo ${mountpoint}
return 0
then
echo ${mountpoint}
return 0
-@@ -3
43,19 +379
,6 @@
+@@ -3
15,19 +351
,6 @@
return 0
fi
done
return 0
fi
done
@@
-86,10
+88,12
@@
fi
done
fi
done
---- a/scripts/boot/9990-cmdline-old
-+++ b/scripts/boot/9990-cmdline-old
+Index: live-boot-grml/scripts/boot/9990-cmdline-old
+===================================================================
+--- live-boot-grml.orig/scripts/boot/9990-cmdline-old 2013-08-15 08:01:04.303981714 +0200
++++ live-boot-grml/scripts/boot/9990-cmdline-old 2013-08-15 08:01:04.299981714 +0200
@@ -18,6 +18,11 @@
@@ -18,6 +18,11 @@
- BOOTIF="${
x
#BOOTIF=}"
+ BOOTIF="${
_PARAMETER
#BOOTIF=}"
;;
+ bootid=*)
;;
+ bootid=*)