X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Finstsoft.GRMLBASE;h=4d087e72e29962d45ee63724a1a16cda30e9eaeb;hp=def9e17458c29f5a06039864a2f3debdbb7fc4ba;hb=130429e20fb319f3ec6a457f3219b7e52216b542;hpb=d09708b40e7d2d06a172da9c167348e2fa44558b diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE index def9e17..4d087e7 100755 --- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE +++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. -# Latest change: Mon Nov 12 11:14:32 CET 2007 [mika] +# Latest change: Sun Nov 25 18:28:54 CET 2007 [mika] ################################################################################ set -u @@ -14,7 +14,8 @@ set -e echo grml_chroot > $target/etc/debian_chroot HOSTNAME='' -[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf +[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf +[ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local [ -n "$HOSTNAME" ] || HOSTNAME=grml echo "$HOSTNAME" > $target/etc/hostname