[Fai-commit] r3726 - trunk/bin

[fai-commit at lists.alioth.debian.org]

Author: lange
Date: 2006-08-01 20:38:50 +0000 (Tue, 01 Aug 2006)
New Revision: 3726

Modified:
   trunk/bin/fai
   trunk/bin/make-fai-nfsroot
Log:
remove solaris code


Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai	2006-08-01 19:56:53 UTC (rev 3725)
+++ trunk/bin/fai	2006-08-01 20:38:50 UTC (rev 3726)
@@ -48,8 +48,6 @@
     # read fai.conf
     # linux dir
     [ -f /etc/fai/fai.conf ] && . /etc/fai/fai.conf
-    # solaris dir
-    [ -f /tmp/install_config/fai/fai.conf ] && . /tmp/install_config/fai/fai.conf
 
     if [ -f /boot/RUNNING_FROM_FAICD ]; then   # we are booting from fai cd
 	umount /initrd

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2006-08-01 19:56:53 UTC (rev 3725)
+++ trunk/bin/make-fai-nfsroot	2006-08-01 20:38:50 UTC (rev 3726)
@@ -204,8 +204,8 @@
 call_debootstrap() {
     
     local dversion=$(dpkg -l debootstrap | grep debootstrap | cut -f7 -d' ')
-    echo "Creating base system for $1 using debootstrap version $dversion"
-    [ "$verbose" ] && echo "Calling debootstrap $1 $NFSROOT $2"
+    echo "Creating base system using debootstrap version $dversion"
+    echo "Calling debootstrap $1 $NFSROOT $2"
     yes '' | LC_ALL=C call_verbose debootstrap $FAI_DEBOOTSTRAP_OPTS $1 $NFSROOT $2
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -