[Fai-commit] r5450 - in trunk: bin conf debian
Thomas Lange
lange at alioth.debian.org
Sun Jul 19 17:09:35 UTC 2009
Author: lange
Date: 2009-07-19 17:09:34 +0000 (Sun, 19 Jul 2009)
New Revision: 5450
Modified:
trunk/bin/fai
trunk/bin/fai-cd
trunk/conf/fai.conf
trunk/conf/make-fai-nfsroot.conf
trunk/debian/NEWS
trunk/debian/changelog
trunk/debian/fai-quickstart.postinst
trunk/debian/fai-quickstart.prerm
trunk/debian/fai-server.preinst
trunk/debian/fai-server.prerm
Log:
* fai.conf, make-fai-nfsroot.conf: move FAI_CONFIGDIR to m-f-n.conf,
because it's only needed on an install server
* fai-cd, fai: get FAI_CONFIGDIR from new config file
* fai-server.preinst, fai-server.prerm, fai-quickstart.postinst: print
warning if FAI_CONFIGDIR is still in the wrong place
* fai-quickstart.prerm: source make-fai-nfsroot.conf instead of fai.conf
Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai 2009-07-19 15:54:13 UTC (rev 5449)
+++ trunk/bin/fai 2009-07-19 17:09:34 UTC (rev 5450)
@@ -61,9 +61,6 @@
FAI_CONFIG_SRC="file://$FAI" # on a fai-cd the config space is already available
fi
- # some variables from are not needed any more
- #unset FAI_CONFIGDIR
-
# read subroutine definitions
local sub=/usr/lib/fai/subroutines
[ -f $sub ] && . $sub
@@ -290,6 +287,9 @@
unset newhostname
if [ X$action = Xdirinstall ]; then
skiptask confdir
+ # dirinstall still uses FAI_CONFIGDIR, which is wrnog IMO. It
+ # should use FAI_CONFIG_SRC
+ FAI_CONFIGDIR=$(source $FAI_ETC_DIR/make-fai-nfsroot.conf; echo $FAI_CONFIGDIR)
export FAI=$FAI_CONFIGDIR
set -a
fi
Modified: trunk/bin/fai-cd
===================================================================
--- trunk/bin/fai-cd 2009-07-19 15:54:13 UTC (rev 5449)
+++ trunk/bin/fai-cd 2009-07-19 17:09:34 UTC (rev 5450)
@@ -30,7 +30,7 @@
#*********************************************************************
set -e
-version="fai-cd 4.0, 3-may-2009"
+version="fai-cd 4.0.1, 19-july-2009"
forceremoval=0;
burn=0
@@ -286,7 +286,7 @@
fi
[ "$verbose" ] && echo "Using configuration files from $cfdir"
. $cfdir/fai.conf
-export NFSROOT=$(source $cfdir/make-fai-nfsroot.conf; echo $NFSROOT)
+. $cfdir/make-fai-nfsroot.conf
servernfsroot=$NFSROOT
NFSROOT="$NFSROOT/live/filesystem.dir"
Modified: trunk/conf/fai.conf
===================================================================
--- trunk/conf/fai.conf 2009-07-19 15:54:13 UTC (rev 5449)
+++ trunk/conf/fai.conf 2009-07-19 17:09:34 UTC (rev 5450)
@@ -19,14 +19,11 @@
# set protocol type for saving logs. Values: ssh, rsh, ftp
FAI_LOGPROTO=ssh
-# the configuration space on the install server
-FAI_CONFIGDIR=/srv/fai/config
-
# how to access the fai config space
-# default if undefined here: nfs://`hostname`/$FAI_CONFIGDIR
+# default if undefined here: nfs://<install server>/$FAI_CONFIGDIR
# supported URL-types: nfs, file, cvs, cvs+ssh, svn+file, svn+http,
# git, git+http,
-#FAI_CONFIG_SRC=nfs://yourservername$FAI_CONFIGDIR
+#FAI_CONFIG_SRC=nfs://yourservername/path/to/config/space
# the following variables are read only for most users
Modified: trunk/conf/make-fai-nfsroot.conf
===================================================================
--- trunk/conf/make-fai-nfsroot.conf 2009-07-19 15:54:13 UTC (rev 5449)
+++ trunk/conf/make-fai-nfsroot.conf 2009-07-19 17:09:34 UTC (rev 5450)
@@ -8,6 +8,9 @@
# TFTP root directory
TFTPROOT=/srv/tftp/fai
+# location of the configuration space on the install server
+FAI_CONFIGDIR=/srv/fai/config
+
# Add a line for mirrorhost and installserver when DNS is not available
# on the clients. This line(s) will be added to $nfsroot/etc/hosts.
#NFSROOT_ETC_HOSTS="192.168.1.250 yourinstallserver"
Modified: trunk/debian/NEWS
===================================================================
--- trunk/debian/NEWS 2009-07-19 15:54:13 UTC (rev 5449)
+++ trunk/debian/NEWS 2009-07-19 17:09:34 UTC (rev 5450)
@@ -1,3 +1,9 @@
+fai (3.2.XXX) unstable; urgency=low
+
+ - variable FAI_CONFIGDIR moved from fai.conf to make-fai-nfsroot.conf
+
+ -- Thomas Lange <lange at debian.org> Sun, 19 Jul 2009 18:54:11 +0200
+
fai (3.2.8) unstable; urgency=low
- new partition tool setup-storage added
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-07-19 15:54:13 UTC (rev 5449)
+++ trunk/debian/changelog 2009-07-19 17:09:34 UTC (rev 5450)
@@ -19,7 +19,13 @@
* fai-savelog: cd to the right place if LOGREMOTEDIR is set, thanks to
Robin Powell for the patch (closes: #515704)
* fai-mirror: remove use of $addpackages (closes: #537544)
-
+ * fai.conf, make-fai-nfsroot.conf: move FAI_CONFIGDIR to m-f-n.conf,
+ because it's only needed on an install server
+ * fai-cd, fai: get FAI_CONFIGDIR from new config file
+ * fai-server.preinst, fai-server.prerm, fai-quickstart.postinst: print
+ warning if FAI_CONFIGDIR is still in the wrong place
+ * fai-quickstart.prerm: source make-fai-nfsroot.conf instead of fai.conf
+
[ Michael Tautschnig ]
* setup-storage/Parser.pm: Set the boot flag on partition mounted at /, if
bootable is not explicitly set.
Modified: trunk/debian/fai-quickstart.postinst
===================================================================
--- trunk/debian/fai-quickstart.postinst 2009-07-19 15:54:13 UTC (rev 5449)
+++ trunk/debian/fai-quickstart.postinst 2009-07-19 17:09:34 UTC (rev 5450)
@@ -16,7 +16,14 @@
case "$1" in
configure)
- . /etc/fai/fai.conf
+
+ # for upgrades from 3.2.20 to newer versions.
+ if egrep -q ^FAI_CONFIGDIR= /etc/fai/fai.conf; then
+ echo "The variable \$FAI_CONFIGDIR is still defined in /etc/fai/fai.conf."
+ echo "Please move it to /etc/fai/make-fai-nfsroot.conf."
+ fi
+
+ . /etc/fai/make-fai-nfsroot.conf
if [ ! -d $FAI_CONFIGDIR/class ]; then
mkdir -p $FAI_CONFIGDIR
cp -a /usr/share/doc/fai-doc/examples/simple/* $FAI_CONFIGDIR
Modified: trunk/debian/fai-quickstart.prerm
===================================================================
--- trunk/debian/fai-quickstart.prerm 2009-07-19 15:54:13 UTC (rev 5449)
+++ trunk/debian/fai-quickstart.prerm 2009-07-19 17:09:34 UTC (rev 5450)
@@ -4,7 +4,7 @@
case "$1" in
purge)
- . /etc/fai/fai.conf
+ . /etc/fai/make-fai-nfsroot.conf
if [ -z "$FAI_CONFIGDIR" ]; then
echo "\$FAI_CONFIGDIR is not defined. Can't remove it."
else
Modified: trunk/debian/fai-server.preinst
===================================================================
--- trunk/debian/fai-server.preinst 2009-07-19 15:54:13 UTC (rev 5449)
+++ trunk/debian/fai-server.preinst 2009-07-19 17:09:34 UTC (rev 5450)
@@ -14,7 +14,12 @@
# For details see /usr/share/doc/packaging-manual/
case "$1" in
- upgrade) ;;
+ upgrade)
+ if egrep -q ^FAI_CONFIGDIR= /etc/fai/fai.conf; then
+ echo "The variable \$FAI_CONFIGDIR is still defined in /etc/fai/fai.conf."
+ echo "Please move it to /etc/fai/make-fai-nfsroot.conf."
+ fi
+ ;;
abort-upgrade) ;;
Modified: trunk/debian/fai-server.prerm
===================================================================
--- trunk/debian/fai-server.prerm 2009-07-19 15:54:13 UTC (rev 5449)
+++ trunk/debian/fai-server.prerm 2009-07-19 17:09:34 UTC (rev 5450)
@@ -20,7 +20,13 @@
# nothing to do during upgrade
case "$1" in
- upgrade) exit 0 ;;
+ upgrade)
+ if egrep -q ^FAI_CONFIGDIR= /etc/fai/fai.conf; then
+ echo "The variable \$FAI_CONFIGDIR is still defined in /etc/fai/fai.conf."
+ echo "Please move it to /etc/fai/make-fai-nfsroot.conf."
+ fi
+ exit 0
+ ;;
esac
. /etc/fai/fai.conf
More information about the Fai-commit
mailing list