[Fai-commit] r3412 - in trunk: bin lib man

[fai-repository at svn.debian.org]

Author: lange
Date: 2006-04-15 21:37:24 +0000 (Sat, 15 Apr 2006)
New Revision: 3412

Modified:
   trunk/bin/fai-chboot
   trunk/bin/make-fai-bootfloppy
   trunk/lib/subroutines-linux
   trunk/man/fai-chboot.8
   trunk/man/make-fai-bootfloppy.8
Log:
FAI_FLAG syslogd was removed, syslogd is now started by default


Modified: trunk/bin/fai-chboot
===================================================================
--- trunk/bin/fai-chboot	2006-04-15 21:34:14 UTC (rev 3411)
+++ trunk/bin/fai-chboot	2006-04-15 21:37:24 UTC (rev 3412)
@@ -28,7 +28,7 @@
 #*********************************************************************
 
 # variable needed: $nfsroot
-$version="version 2.1.1 5-april-2006";
+$version="version 2.1.2 15-april-2006";
 
 use Socket;
 use Net::hostent;
@@ -392,8 +392,8 @@
   $rootfs = shift;
 }
 
-$opt_F and $opt_f="verbose,sshd,createvt,syslogd";
-$opt_B and $opt_f="verbose,sshd,syslogd,reboot";
+$opt_F and $opt_f="verbose,sshd,createvt";
+$opt_B and $opt_f="verbose,sshd,reboot";
 $opt_f and $flags="FAI_FLAGS=$opt_f";
 warn "append parameters: $bootprot $opt_k $flags\n" if $verbose;
 warn "Booting $kernelname\nrootfs is $rootfs\n" if $verbose;

Modified: trunk/bin/make-fai-bootfloppy
===================================================================
--- trunk/bin/make-fai-bootfloppy	2006-04-15 21:34:14 UTC (rev 3411)
+++ trunk/bin/make-fai-bootfloppy	2006-04-15 21:37:24 UTC (rev 3412)
@@ -73,7 +73,7 @@
       Without this option DHCP is used.
    -h         print this message.
    -F         append default flags to kernel parameters.
-              Same as "FAI_FLAGS=verbose,sshd,createvt,syslogd"
+              Same as "FAI_FLAGS=verbose,sshd,createvt"
    -f FILE    make a floppy image in FILE
    -g         use GRUB loader on bootfloppy (default)
    -i FILE    make a iso9660 image in FILE
@@ -293,7 +293,7 @@
 	s) TARGETHOST="$OPTARG" ;;
 	d) BTYPE="$OPTARG" ;;
 	v) verbose=1 ;;
-	F) flags="FAI_FLAGS=verbose,sshd,createvt,syslogd" ;;
+	F) flags="FAI_FLAGS=verbose,sshd,createvt" ;;
         ?) echo "Error parsing arguments"; exit 1;;
     esac
 done

Modified: trunk/lib/subroutines-linux
===================================================================
--- trunk/lib/subroutines-linux	2006-04-15 21:34:14 UTC (rev 3411)
+++ trunk/lib/subroutines-linux	2006-04-15 21:37:24 UTC (rev 3412)
@@ -56,11 +56,8 @@
     fi
     define_fai_flags
     if [ $DO_INIT_TASKS -eq 1 ] ; then
-        [ "$syslogd" ] && {
-          klogd -c7 -f $LOGDIR/kernel.log
-          syslogd -m 0
-        }
-
+	klogd -c7 -f $LOGDIR/kernel.log
+	syslogd -m 0
         create_resolv_conf
     fi
     get_fai_dir

Modified: trunk/man/fai-chboot.8
===================================================================
--- trunk/man/fai-chboot.8	2006-04-15 21:34:14 UTC (rev 3411)
+++ trunk/man/fai-chboot.8	2006-04-15 21:37:24 UTC (rev 3412)
@@ -1,5 +1,5 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
-.TH fai-chboot 8 "1 april 2006" "FAI 2.10"
+.TH fai-chboot 8 "15 april 2006" "FAI 2.10"
 .SH NAME
 fai-chboot \- manage the network boot configuration files
 .SH SYNOPSIS
@@ -37,7 +37,7 @@
 .TP
 .BI \-B
 Set default values for FAI_FLAGS. This is the same as -f
-verbose,sshd,syslogd,reboot
+verbose,sshd,reboot
 .TP
 .B \-c
 Copy an existing config file to one or more hosts or templates and enable
@@ -56,7 +56,7 @@
 .TP
 .BI \-F
 Set default values for FAI_FLAGS. This is the same as -f
-verbose,sshd,createvt,syslogd
+verbose,sshd,createvt
 .TP
 .B \-h
 Show simle help and version.

Modified: trunk/man/make-fai-bootfloppy.8
===================================================================
--- trunk/man/make-fai-bootfloppy.8	2006-04-15 21:34:14 UTC (rev 3411)
+++ trunk/man/make-fai-bootfloppy.8	2006-04-15 21:37:24 UTC (rev 3412)
@@ -61,7 +61,7 @@
 .TP
 .B \-F
 Append default flags to kernel parameters. Same as
-"FAI_FLAGS=verbose,sshd,createvt,syslogd"
+"FAI_FLAGS=verbose,sshd,createvt"
 .TP
 .B \-f FILE
 Make a floppy image in FILE.