projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Unifiy local config handling
[grml-live.git]
/
etc
/
grml
/
fai
/
config
/
scripts
/
GRMLBASE
/
01-packages
diff --git
a/etc/grml/fai/config/scripts/GRMLBASE/01-packages
b/etc/grml/fai/config/scripts/GRMLBASE/01-packages
index
b598516
..
5ad6aa9
100755
(executable)
--- a/
etc/grml/fai/config/scripts/GRMLBASE/01-packages
+++ b/
etc/grml/fai/config/scripts/GRMLBASE/01-packages
@@
-10,7
+10,7
@@
set -u
set -e
[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
-[ -
r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local
+[ -
n "$GRML_LIVE_LOCAL_CONFIG" ] && . "$GRML_LIVE_LOCAL_CONFIG"
PACKAGE_LIST=/var/log/install_packages.list