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
/
07_support_findiso.patch
diff --git
a/debian/patches/07_support_findiso.patch
b/debian/patches/07_support_findiso.patch
index
e0b0367
..
13f4314
100644
(file)
--- a/
debian/patches/07_support_findiso.patch
+++ b/
debian/patches/07_support_findiso.patch
@@
-10,8
+10,10
@@
# file is searched inside that ISO file then.
@DPATCH@
# file is searched inside that ISO file then.
@DPATCH@
---- a/scripts/live
-+++ b/scripts/live
+Index: live-boot-grml/scripts/live
+===================================================================
+--- live-boot-grml.orig/scripts/live 2011-12-06 21:34:27.000000000 +0100
++++ live-boot-grml/scripts/live 2011-12-06 21:48:28.000000000 +0100
@@ -106,6 +106,11 @@
export FETCH
;;
@@ -106,6 +106,11 @@
export FETCH
;;
@@
-24,7
+26,7
@@
forcepersistentfsck)
FORCEPERSISTENTFSCK="Yes"
export FORCEPERSISTENTFSCK
forcepersistentfsck)
FORCEPERSISTENTFSCK="Yes"
export FORCEPERSISTENTFSCK
-@@ -1
629,13 +1634,28
@@
+@@ -1
759,6 +1764,21
@@
mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue
[ -n "$devuid" ] && echo "$devuid" >> $tried
mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue
[ -n "$devuid" ] && echo "$devuid" >> $tried
@@
-46,15
+48,7
@@
if is_live_path ${mountpoint} && \
([ "${skip_uuid_check}" ] || matches_uuid ${mountpoint})
then
if is_live_path ${mountpoint} && \
([ "${skip_uuid_check}" ] || matches_uuid ${mountpoint})
then
- echo ${mountpoint}
- return 0
- else
-- umount ${mountpoint}
-+ umount ${mountpoint} 2>/dev/null
- fi
- fi
-
-@@ -1933,6 +1953,22 @@
+@@ -2046,6 +2066,22 @@
# when booting FAI, this simple workaround solves it
ls /root/* >/dev/null 2>&1
# when booting FAI, this simple workaround solves it
ls /root/* >/dev/null 2>&1