[Fai-commit] r4074 - in trunk: bin debian lib man

fai-commit at lists.alioth.debian.org fai-commit at lists.alioth.debian.org
Tue Oct 10 21:26:09 UTC 2006


Author: lange
Date: 2006-10-10 21:26:08 +0000 (Tue, 10 Oct 2006)
New Revision: 4074

Modified:
   trunk/bin/fai
   trunk/debian/NEWS
   trunk/debian/changelog
   trunk/lib/subroutines
   trunk/lib/updatebase
   trunk/man/fai.8
Log:
rename action dirinst to dirinstall (closes: #390345)


Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai	2006-10-09 23:30:52 UTC (rev 4073)
+++ trunk/bin/fai	2006-10-10 21:26:08 UTC (rev 4074)
@@ -80,7 +80,7 @@
     [ "$FAI_ROOT" = '/' ] && ROOTCMD=
     target=$FAI_ROOT
 
-    if [ X$action = Xdirinst -a -n "$newhostname" ]; then
+    if [ X$action = Xdirinstall -a -n "$newhostname" ]; then
 	HOSTNAME=$newhostname
 	HOST=$newhostname
 	unset newhostname
@@ -221,9 +221,9 @@
 
 # override FAI_ACTION later if a command line argument is given
 [ "$1" ] && action=$1
-[ "$2" ] && export FAI_ROOT=$2 # only used for dirinst
+[ "$2" ] && export FAI_ROOT=$2 # only used for dirinstall
 
-if [ X$action = Xdirinst ]; then
+if [ X$action = Xdirinstall ]; then
     if [ -z "$FAI_ROOT" ]; then
 	echo "Please specify a target directory. Aborted"
 	exit 3
@@ -263,7 +263,7 @@
 fi
 
 fai_init
-if [ X$action = Xdirinst ]; then
+if [ X$action = Xdirinstall ]; then
     skiptask confdir
     export FAI=$FAI_CONFIGDIR
     set -a

Modified: trunk/debian/NEWS
===================================================================
--- trunk/debian/NEWS	2006-10-09 23:30:52 UTC (rev 4073)
+++ trunk/debian/NEWS	2006-10-10 21:26:08 UTC (rev 4074)
@@ -1,3 +1,9 @@
+fai (3.1) unstable; urgency=medium
+
+  - rename action dirinst to dirinstall
+
+ -- Thomas Lange <lange at debian.org>  Wed, 27 Sep 2006 14:41:11 +0200
+
 fai (3.0) unstable; urgency=low
 
   - WARNING: the fai-guide does not yet reflect the changes from FAI 2 to FAI 3

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-10-09 23:30:52 UTC (rev 4073)
+++ trunk/debian/changelog	2006-10-10 21:26:08 UTC (rev 4074)
@@ -1,6 +1,7 @@
-fai (3.0.1) unstable; urgency=low
+fai (3.1) unstable; urgency=low
 
   * Makefile: force bash in Makefile, fixes FTBFS in ubuntu
+  * rename action dirinst to dirinstall (closes: #390345)
   * fai-cd: fix wrong path for sources.list (closes: #391639)
   * scripts/FAIBASE/10-misc: use ainsl instead of echo >> ...
   * lib/create_ramdisk: make /var/discover writeable
@@ -13,8 +14,11 @@
     sources.list must be used from /etc/apt during normal installation
   * fai: add option -u,--hostname (closes: #390367)
   * LAST/5-misc: do not fail if hardware clock can't be set
+  * fcopy: swap call of postinst and set_mode
+  * install_packages: add missing package list to yum and rpm calls
+    (closes: #392032)
   
- -- Thomas Lange <lange at debian.org>  Mon,  9 Oct 2006 18:06:39 +0200
+ -- Thomas Lange <lange at debian.org>  Tue, 10 Oct 2006 01:29:35 +0200
 
 fai (3.0) unstable; urgency=low
 

Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines	2006-10-09 23:30:52 UTC (rev 4073)
+++ trunk/lib/subroutines	2006-10-10 21:26:08 UTC (rev 4074)
@@ -259,9 +259,9 @@
 	    task install
 	    task faiend
 	    ;;
-	dirinst)
+	dirinstall)
 	    echo "Installing into directory $FAI_ROOT"
-	    task dirinst
+	    task dirinstall
 	    ;;
 	softupdate)
 	    echo Performing FAI system update. All data may be overwritten!
@@ -458,7 +458,7 @@
     fi
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-task_dirinst() {
+task_dirinstall() {
 
     > $stamp
 

Modified: trunk/lib/updatebase
===================================================================
--- trunk/lib/updatebase	2006-10-09 23:30:52 UTC (rev 4073)
+++ trunk/lib/updatebase	2006-10-10 21:26:08 UTC (rev 4074)
@@ -1,7 +1,6 @@
 #! /bin/bash
 
-# TODO: execute this when doing dirinst
-if [ "$FAI_ACTION" = "install" -o "$FAI_ACTION" = "dirinst" ]; then
+if [ "$FAI_ACTION" = "install" -o "$FAI_ACTION" = "dirinstall" ]; then
     # some packages must access /proc even in chroot environment
     mount -t proc proc $FAI_ROOT/proc
     # some packages must access /sys even in chroot environment

Modified: trunk/man/fai.8
===================================================================
--- trunk/man/fai.8	2006-10-09 23:30:52 UTC (rev 4073)
+++ trunk/man/fai.8	2006-10-10 21:26:08 UTC (rev 4074)
@@ -1,5 +1,5 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
-.TH fai 8 "27 september 2006" "FAI 3"
+.TH fai 8 "10 october 2006" "FAI 3.1"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -19,7 +19,7 @@
 .RI [ options ] " ACTION"
 .br
 .B fai
-.RI [ options ] " dirinst DIRECTORY"
+.RI [ options ] " dirinstall DIRECTORY"
 .SH DESCRIPTION
 fai starts a fai-action, e.g. an installation or a softupdate.
 If the variable FAI_ACTION is defined, this action will be
@@ -102,7 +102,7 @@
 .RE
 
 .TP
-.B dirinst [DIR]
+.B dirinstall [DIR]
 Installation into a directory. This is nearly the same as action
 install except for skipping the task that partitions the hard disks and
 creates the file systems. Classes should be defined with option -c.
@@ -112,7 +112,7 @@
 certainly destroy it.
 .SH EXAMPLES
 
-   fai -v dirinst /srv/etchroot -cDEFAULT,FAIBASE,LAST
+   fai -v dirinstall /srv/etchroot -cDEFAULT,FAIBASE,LAST
 
 This command will do an installation into the directory
 /src/etchroot. For defining variables, selecting the software packages




More information about the Fai-commit mailing list