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:
6785317
)
Reading configuration files in initramfs-tools hook too.
author
Daniel Baumann
<daniel@debian.org>
Tue, 14 Aug 2012 18:51:32 +0000
(20:51 +0200)
committer
Daniel Baumann
<daniel@debian.org>
Tue, 14 Aug 2012 18:51:53 +0000
(20:51 +0200)
backends/initramfs-tools/live.hook
patch
|
blob
|
history
diff --git
a/backends/initramfs-tools/live.hook
b/backends/initramfs-tools/live.hook
index
00da049
..
89420b6
100755
(executable)
--- a/
backends/initramfs-tools/live.hook
+++ b/
backends/initramfs-tools/live.hook
@@
-6,19
+6,15
@@
set -e
[ "${QUIET}" ] || echo -n "live-boot:"
[ "${QUIET}" ] || echo -n "live-boot:"
-# Reading configuration files
-if [ -e /etc/live/boot.conf ]
-then
- . /etc/live/boot.conf
-fi
-
-if ls /etc/live/boot/* > /dev/null 2>&1
-then
- for _FILE in /etc/live/boot/*
- do
- . ${_FILE}
- done
-fi
+# Reading configuration file from filesystem and live-media
+for _FILE in /etc/live/boot.conf /etc/live/boot/* \
+ /live/image/live/boot.conf /live/image/live/boot/*
+do
+ if [ -e "${_FILE}" ]
+ then
+ . "${_FILE}"
+ fi
+done
# Checking live-boot
if [ ! -e /lib/live/boot ]
# Checking live-boot
if [ ! -e /lib/live/boot ]