From d900a0e4047e51b27cda624a104ae97a1625c080 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sun, 8 Nov 2009 11:53:50 +0100 Subject: [PATCH 1/1] Set FAI_CONFIGDIR=/etc/grml/fai/config in /etc/grml/fai/fai.conf --- debian/changelog | 9 ++++++--- docs/grml-live.txt | 5 +++-- etc/grml/fai/fai.conf | 1 + grml-live | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index b4be089..a3065e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ -grml-live (0.9.32) UNRELEASED; urgency=low +grml-live (0.9.32) unstable; urgency=low - * Update docs to reflect current FAI_CONFIG_SRC setup. + * Update docs to reflect current FAI_CONFIG_* setup. + * Set FAI_CONFIGDIR=/etc/grml/fai/config in /etc/grml/fai/fai.conf + so FAI versions older than 3.3 still work. Thanks for the bugreport, + Christian Hofstaedtler. - -- Michael Prokop Wed, 04 Nov 2009 23:39:26 +0100 + -- Michael Prokop Sun, 08 Nov 2009 11:50:46 +0100 grml-live (0.9.31) unstable; urgency=low diff --git a/docs/grml-live.txt b/docs/grml-live.txt index 3d7d0f5..0cf9f3b 100644 --- a/docs/grml-live.txt +++ b/docs/grml-live.txt @@ -358,8 +358,9 @@ commandline. /etc/grml/fai/fai.conf Main configuration file for FAI which specifies where all the configuration -files and scripts for FAI/grml-live can be found. By default it is set to -FAI_CONFIG_SRC=file:///etc/grml/fai/config being a directory shipped by +files and scripts for FAI/grml-live can be found. By default the configuration +variables are FAI_CONFIG_SRC=file:///etc/grml/fai/config and +FAI_CONFIGDIR=/etc/grml/fai/config - both pointing to a directory shipped by grml-live out-of-the-box so you shouldn't have to configure anything in this file. diff --git a/etc/grml/fai/fai.conf b/etc/grml/fai/fai.conf index 526c17d..c6ede7d 100644 --- a/etc/grml/fai/fai.conf +++ b/etc/grml/fai/fai.conf @@ -24,6 +24,7 @@ FAI_LOGPROTO=ssh # supported URL-types: nfs, file, cvs, cvs+ssh, svn+file, svn+http,... #FAI_CONFIG_SRC=nfs://yourservername$FAI_CONFIGDIR FAI_CONFIG_SRC=file:///etc/grml/fai/config +FAI_CONFIGDIR=/etc/grml/fai/config # the following variables are read only for most users diff --git a/grml-live b/grml-live index beff79c..afbf7d6 100755 --- a/grml-live +++ b/grml-live @@ -23,7 +23,7 @@ fi set -e # global variables -GRML_LIVE_VERSION='0.9.32-pre1' +GRML_LIVE_VERSION='0.9.32' PN="$(basename $0)" CMDLINE="$0 $@" SOURCES_LIST_FILE='/etc/grml/fai/apt/sources.list' -- 2.1.4