diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-08-14 20:51:32 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-08-14 20:51:53 +0200 |
| commit | 6f81ca95930688ac8fc9fb7409f91015083fc832 (patch) | |
| tree | 7dbd8ad384ad9e6e9c54e09fd259af3b69635b04 /backends | |
| parent | 67853178ea148fb146b417b335252258233c9e10 (diff) | |
| download | live-boot-6f81ca95930688ac8fc9fb7409f91015083fc832.tar.gz live-boot-6f81ca95930688ac8fc9fb7409f91015083fc832.zip | |
Reading configuration files in initramfs-tools hook too.
Diffstat (limited to 'backends')
| -rwxr-xr-x | backends/initramfs-tools/live.hook | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/backends/initramfs-tools/live.hook b/backends/initramfs-tools/live.hook index 00da049..89420b6 100755 --- a/backends/initramfs-tools/live.hook +++ b/backends/initramfs-tools/live.hook @@ -6,19 +6,15 @@ set -e [ "${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 ] |