[Fai-commit] r3374 - in trunk: bin
examples/simple/files/etc/fai/fai.conf
fai-repository at svn.debian.org
fai-repository at svn.debian.org
Thu Apr 6 10:27:40 UTC 2006
Author: lange
Date: 2006-04-06 10:27:39 +0000 (Thu, 06 Apr 2006)
New Revision: 3374
Modified:
trunk/bin/fai
trunk/bin/make-fai-nfsroot
trunk/examples/simple/files/etc/fai/fai.conf/FAISERVER
Log:
remove $OS_TYPE from fai.conf
Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai 2006-04-05 16:20:29 UTC (rev 3373)
+++ trunk/bin/fai 2006-04-06 10:27:39 UTC (rev 3374)
@@ -47,7 +47,7 @@
cat <<-EOF
-----------------------------------------------------
Fully Automatic Installation for $osname
- $FAI_VERSION Copyright (c) 1999-2005
+ $FAI_VERSION Copyright (c) 1999-2006
Thomas Lange <lange at informatik.uni-koeln.de>
-----------------------------------------------------
@@ -56,10 +56,11 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
fai_init() {
- local sub osname
+ local sub osname OS_TYPE
set -a # now export all variables
umask 022
+ OS_TYPE=$(uname -s | tr A-Z a-z)
# read fai.conf
# linux dir
[ -f /etc/fai/fai.conf ] && . /etc/fai/fai.conf
Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot 2006-04-05 16:20:29 UTC (rev 3373)
+++ trunk/bin/make-fai-nfsroot 2006-04-06 10:27:39 UTC (rev 3374)
@@ -285,7 +285,7 @@
PATH=/usr/local/sbin:/usr/local/bin:/usr/lib/fai:/bin:/sbin:/usr/bin:/usr/sbin:
export PATH
. /usr/lib/fai/subroutines
- . /usr/lib/fai/subroutines-$OS_TYPE
+ . /usr/lib/fai/subroutines-linux
set -a
. /tmp/fai/variables.sh 2>/dev/null
EOF
Modified: trunk/examples/simple/files/etc/fai/fai.conf/FAISERVER
===================================================================
--- trunk/examples/simple/files/etc/fai/fai.conf/FAISERVER 2006-04-05 16:20:29 UTC (rev 3373)
+++ trunk/examples/simple/files/etc/fai/fai.conf/FAISERVER 2006-04-06 10:27:39 UTC (rev 3374)
@@ -59,6 +59,3 @@
# the local configuration directory on the install client
FAI=/fai
-
-# the type of operating system (linux, sunos)
-OS_TYPE=`uname -s | tr A-Z a-z`
More information about the Fai-commit
mailing list