[Fai-commit] r3831 - in trunk: bin examples/simple/scripts/LAST lib
fai-commit at lists.alioth.debian.org
fai-commit at lists.alioth.debian.org
Mon Sep 4 10:41:37 UTC 2006
Author: lange
Date: 2006-09-04 10:41:36 +0000 (Mon, 04 Sep 2006)
New Revision: 3831
Modified:
trunk/bin/fai
trunk/examples/simple/scripts/LAST/50-misc
trunk/lib/prcopyleft
trunk/lib/subroutines
trunk/lib/subroutines-linux
Log:
rename $DO_INIT_TASKS to $do_init_tasks
Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai 2006-09-04 10:39:50 UTC (rev 3830)
+++ trunk/bin/fai 2006-09-04 10:41:36 UTC (rev 3831)
@@ -76,7 +76,7 @@
DEBIAN_FRONTEND=noninteractive
# local disks are mounted to $FAI_ROOT
if [ -z "$FAI_ROOT" ] ; then
- [ $DO_INIT_TASKS -eq 1 ] && FAI_ROOT=/tmp/target || FAI_ROOT=/
+ [ $do_init_tasks -eq 1 ] && FAI_ROOT=/tmp/target || FAI_ROOT=/
fi
# executed command in the environment of the new system
ROOTCMD="chroot $FAI_ROOT"
@@ -87,13 +87,13 @@
# several log files
diskvar=$LOGDIR/disk_var.sh
- if [ $DO_INIT_TASKS -eq 1 ]; then
+ if [ $do_init_tasks -eq 1 ]; then
trap 'echo "Now rebooting";faireboot' INT QUIT ;
else
trap "echo 'Aborted';rm -f $stamp" INT QUIT ;
fi
- if [ $DO_INIT_TASKS -eq 1 ]; then
+ if [ $do_init_tasks -eq 1 ]; then
eval_cmdline
# if HOST was specified on the commandline, set hostname to it
if [ -n "$HOST" ]; then
@@ -145,9 +145,9 @@
task setup
task defclass
unset cmdlineclasses renewclass
- [ $DO_INIT_TASKS -eq 1 ] && set_disk_info
+ [ $do_init_tasks -eq 1 ] && set_disk_info
task defvar
- [ $DO_INIT_TASKS -eq 1 ] && load_keymap_consolechars
+ [ $do_init_tasks -eq 1 ] && load_keymap_consolechars
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Main routine
@@ -227,9 +227,9 @@
fi
# are we called as an init substitute ?
-export DO_INIT_TASKS=0
-[ "$0" = "/etc/init.d/rcS" ] && DO_INIT_TASKS=1
-if [ $DO_INIT_TASKS -eq 1 ]; then
+export do_init_tasks=0
+[ "$0" = "/etc/init.d/rcS" ] && do_init_tasks=1
+if [ $do_init_tasks -eq 1 ]; then
renewclass=1 # always renew class list when installing
create_ramdisk
fi
@@ -240,7 +240,7 @@
mkdir -p $LOGDIR
# for compability, can be removed later
-if [ $DO_INIT_TASKS -eq 1 ]; then
+if [ $do_init_tasks -eq 1 ]; then
mkdir /tmp/fai
mount --bind $LOGDIR /tmp/fai
fi
Modified: trunk/examples/simple/scripts/LAST/50-misc
===================================================================
--- trunk/examples/simple/scripts/LAST/50-misc 2006-09-04 10:39:50 UTC (rev 3830)
+++ trunk/examples/simple/scripts/LAST/50-misc 2006-09-04 10:41:36 UTC (rev 3831)
@@ -14,7 +14,7 @@
echo "#$FAI_DEBMIRROR $MNTPOINT nfs ro 0 0" >> $target/etc/fstab
# set bios clock
-if [ $DO_INIT_TASKS -eq 1 ] ; then
+if [ $do_init_tasks -eq 1 ] ; then
case "$UTC" in
no|"") hwopt="--localtime" ;;
yes) hwopt="--utc" ;;
Modified: trunk/lib/prcopyleft
===================================================================
--- trunk/lib/prcopyleft 2006-09-04 10:39:50 UTC (rev 3830)
+++ trunk/lib/prcopyleft 2006-09-04 10:41:36 UTC (rev 3831)
@@ -8,7 +8,7 @@
#
#*********************************************************************
-# variables needed: FAI_VERSION, DO_INIT_TASKS
+# variables needed: FAI_VERSION, do_init_tasks
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
_prcopyleft() {
@@ -25,7 +25,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# color logo only if initial install
-COLOR_FAI_LOGO=$DO_INIT_TASKS
+COLOR_FAI_LOGO=$do_init_tasks
# set red color, but not on some archs
[ -e /.nocolorlogo ] && COLOR_FAI_LOGO=0
Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines 2006-09-04 10:39:50 UTC (rev 3830)
+++ trunk/lib/subroutines 2006-09-04 10:41:36 UTC (rev 3831)
@@ -189,7 +189,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
### BEGIN SUBROUTINE INFO
# Provides-Var: $FAI_RUNDATE
-# Requires-Var: $DOMAIN $DO_INIT_TASKS
+# Requires-Var: $DOMAIN $do_init_tasks
# Suggests-Var: $flag_createvt $flag_sshd
# Short-Description: <task desc.>
### END SUBROUTINE INFO
@@ -202,7 +202,7 @@
define_fai_flags
# this may be moved to an external script
- if [ $DO_INIT_TASKS -eq 1 ] ; then
+ if [ $do_init_tasks -eq 1 ] ; then
# set the system time and date using rdate or/and ntpdate
[ "$TIMESRVS_1" ] && rdate $TIMESRVS_1
[ "$NTPSRVS_1" ] && ntpdate -b -v $NTPSRVS
@@ -240,7 +240,7 @@
case $FAI_ACTION in
install)
- if [ $DO_INIT_TASKS -eq 0 ]; then
+ if [ $do_init_tasks -eq 0 ]; then
echo "Cowardly refusing to run a FAI installation on a running system."
return
fi
@@ -380,7 +380,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
task_faiend() {
- [ $DO_INIT_TASKS -eq 0 ] && exit 0
+ [ $do_init_tasks -eq 0 ] && exit 0
wait_for_jobs
echo "Press <RETURN> to reboot or ctrl-c to execute a shell"
# reboot without prompting if FAI_FLAG reboot is set
Modified: trunk/lib/subroutines-linux
===================================================================
--- trunk/lib/subroutines-linux 2006-09-04 10:39:50 UTC (rev 3830)
+++ trunk/lib/subroutines-linux 2006-09-04 10:41:36 UTC (rev 3831)
@@ -53,7 +53,7 @@
task_confdir() {
- if [ $DO_INIT_TASKS -eq 1 ] ; then
+ if [ $do_init_tasks -eq 1 ] ; then
local bootlog
eval_cmdline
@@ -112,7 +112,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
### BEGIN SUBROUTINE INFO
# Provides-Var: none
-# Requires-Var: $FAI_ROOT $DO_INIT_TASKS $NFSROOT
+# Requires-Var: $FAI_ROOT $do_init_tasks $NFSROOT
# Suggests-Var: $LOGDIR
# Short-Description: <task desc.>
### END SUBROUTINE INFO
@@ -126,7 +126,7 @@
# copy the base file class based if it exists
ftar -1v -s $FAI/basefiles /
if [ $? -ne 0 ]; then
- [ $DO_INIT_TASKS -eq 0 ] && basefile=$NFSROOT/var/tmp/base.tgz
+ [ $do_init_tasks -eq 0 ] && basefile=$NFSROOT/var/tmp/base.tgz
# extract the tar file which was the result of debootstrap
echo "Extracting $NFSROOT/var/tmp/base.tgz"
gzip -dc $basefile | tar -C $FAI_ROOT -xpf -
@@ -212,7 +212,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
task_finish() {
- if [ $DO_INIT_TASKS -eq 1 ] ; then
+ if [ $do_init_tasks -eq 1 ] ; then
# show some local information
ifconfig; df
# umount swap space
More information about the Fai-commit
mailing list