summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDieter Plaetinck <dieter@plaetinck.be>2009-02-22 17:48:13 +0100
committerDieter Plaetinck <dieter@plaetinck.be>2009-02-22 17:48:13 +0100
commitfb96730dbfd801c45bc2009c1960d30403ecabc1 (patch)
treed630d8a527d627db1e971d0474c5132f16db27d5
parentf4bd7c36b44da0c9a5985868aa8b0183cd4414c8 (diff)
since we use /tmp now, no more need to hide files. some categorizing (tagging) of files is useful though
-rw-r--r--examples/deployconfig-dieter4
-rwxr-xr-xsrc/aif.sh2
-rw-r--r--src/core/libs/lib-blockdevices-filesystems.sh10
-rw-r--r--src/core/libs/lib-misc.sh8
-rw-r--r--src/core/libs/lib-ui.sh4
-rw-r--r--src/core/procedures/base2
6 files changed, 15 insertions, 15 deletions
diff --git a/examples/deployconfig-dieter b/examples/deployconfig-dieter
index 396de45..75a197c 100644
--- a/examples/deployconfig-dieter
+++ b/examples/deployconfig-dieter
@@ -22,8 +22,8 @@ phase_system+=(configure_home)
worker_fetch_configs ()
{
- $SVN export $SVN_BASE/ddm-configs/$DEPLOY_CLASS/trunk/disks/.blockdata $RUNTIME_DIR/.blockdata || die_error "Could not svn export $SVN_BASE/ddm-configs/$DEPLOY_CLASS/trunk/disks/.blockdata to $RUNTIME_DIR/.blockdata"
- $SVN export $SVN_BASE/ddm-configs/$DEPLOY_CLASS/trunk/disks/.partitions $RUNTIME_DIR/.partitions || die_error "Could not svn export $SVN_BASE/ddm-configs/$DEPLOY_CLASS/trunk/disks/.partitions to $RUNTIME_DIR/.partitions"
+ $SVN export $SVN_BASE/ddm-configs/$DEPLOY_CLASS/trunk/disks/.blockdata $RUNTIME_DIR/aif-blockdata || die_error "Could not svn export $SVN_BASE/ddm-configs/$DEPLOY_CLASS/trunk/disks/.blockdata to $RUNTIME_DIR/aif-blockdata"
+ $SVN export $SVN_BASE/ddm-configs/$DEPLOY_CLASS/trunk/disks/.partitions $RUNTIME_DIR/aif-partitions || die_error "Could not svn export $SVN_BASE/ddm-configs/$DEPLOY_CLASS/trunk/disks/.partitions to $RUNTIME_DIR/aif-partitions"
}
diff --git a/src/aif.sh b/src/aif.sh
index b2662eb..2e3eac9 100755
--- a/src/aif.sh
+++ b/src/aif.sh
@@ -103,7 +103,7 @@ load_procedure()
if [ "$1" = 'http:' ]
then
log "Loading procedure $2 ..."
- procedure=$RUNTIME_DIR/procedure-downloaded-`basename $2`
+ procedure=$RUNTIME_DIR/aif-procedure-downloaded-`basename $2`
wget "$2" -q -O $procedure >/dev/null || die_error "Could not download procedure $2"
else
log "Loading procedure $1/procedures/$2 ..."
diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh
index 3b43541..1cbfcbe 100644
--- a/src/core/libs/lib-blockdevices-filesystems.sh
+++ b/src/core/libs/lib-blockdevices-filesystems.sh
@@ -25,11 +25,11 @@ modprobe aes-i586 || show_warning modprobe 'Could not modprobe aes-i586. no supp
-TMP_DEV_MAP=$RUNTIME_DIR/dev.map
-TMP_FSTAB=$RUNTIME_DIR/.fstab
-TMP_PARTITIONS=$RUNTIME_DIR/.partitions
-TMP_FILESYSTEMS=$RUNTIME_DIR/.filesystems # Only used internally by this library. Do not even think about using this as interface to this library. it won't work
-TMP_BLOCKDEVICES=$RUNTIME_DIR/.blockdata
+TMP_DEV_MAP=$RUNTIME_DIR/aif-dev.map
+TMP_FSTAB=$RUNTIME_DIR/aif-fstab
+TMP_PARTITIONS=$RUNTIME_DIR/aif-partitions
+TMP_FILESYSTEMS=$RUNTIME_DIR/aif-filesystems # Only used internally by this library. Do not even think about using this as interface to this library. it won't work
+TMP_BLOCKDEVICES=$RUNTIME_DIR/aif-blockdata
diff --git a/src/core/libs/lib-misc.sh b/src/core/libs/lib-misc.sh
index 01c291f..c7a5d2f 100644
--- a/src/core/libs/lib-misc.sh
+++ b/src/core/libs/lib-misc.sh
@@ -14,7 +14,7 @@ run_background ()
debug "run_background called. identifier: $1, command: $2, logfile: $3"
( \
- touch $RUNTIME_DIR/.$1-running
+ touch $RUNTIME_DIR/aif-$1-running
debug "run_background starting $1: $2 >>$3 2>&1"
[ -f $3 ] && echo -e "\n\n\n" >>$3
echo "STARTING $1 . Executing $2 >>$3 2>&1\n" >> $3;
@@ -23,7 +23,7 @@ run_background ()
read $var_exit <<< $? #TODO: bash complains about 'not a valid identifier'
debug "run_background done with $1: exitcode (\$$1_exitcode): "${!var_exit}" .Logfile $3" #TODO ${!var_exit} doesn't show anything --> maybe fixed now
echo >> $3
- rm -f $RUNTIME_DIR/.$1-running
+ rm -f $RUNTIME_DIR/aif-$1-running
) &
sleep 2
@@ -36,7 +36,7 @@ wait_for ()
{
[ -z "$1" ] && die_error "wait_for needs an identifier to known on which command to wait!"
- while [ -f $RUNTIME_DIR/.$1-running ]
+ while [ -f $RUNTIME_DIR/aif-$1-running ]
do
#TODO: follow_progress dialog mode = nonblocking (so check and sleep is good), cli mode (tail -f )= blocking? (so check is probably not needed as it will be done)
sleep 1
@@ -66,5 +66,5 @@ check_is_in ()
cleanup_runtime ()
{
mkdir -p $RUNTIME_DIR || die_error "Cannot create $RUNTIME_DIR"
- rm -rf $RUNTIME_DIR/.dia* &>/dev/null
+ rm -rf $RUNTIME_DIR/aif-dia* &>/dev/null
}
diff --git a/src/core/libs/lib-ui.sh b/src/core/libs/lib-ui.sh
index 2315394..0664817 100644
--- a/src/core/libs/lib-ui.sh
+++ b/src/core/libs/lib-ui.sh
@@ -6,9 +6,9 @@
# Taken from setup. we store dialog output in a file. TODO: can't we do this with variables? ASKDEV
-ANSWER=$RUNTIME_DIR/.dialog-answer
+ANSWER=$RUNTIME_DIR/aif-dialog-answer
DIA_MENU_TEXT="Use the UP and DOWN arrows to navigate menus. Use TAB to switch between buttons and ENTER to select."
-DIA_SUCCESSIVE_ITEMS=$RUNTIME_DIR/.dia-successive-items
+DIA_SUCCESSIVE_ITEMS=$RUNTIME_DIR/aif-dia-successive-items
### Functions that your code can use. Cli/dialog mode is fully transparant. This library takes care of it ###
diff --git a/src/core/procedures/base b/src/core/procedures/base
index c22a01c..cf4e7e2 100644
--- a/src/core/procedures/base
+++ b/src/core/procedures/base
@@ -5,7 +5,7 @@ var_DEFAULTFS="/boot:32:ext2:+ swap:256:swap /:7500:ext3 /home:*:ext3"
var_TARGET_DIR="/mnt" # When overriding this, do _not_ add a trailing /. It's not needed and maybe you could even break something
var_RUNTIME_REPOSITORIES= # array like this ('name1' 'location of repo 1' ['name2' 'location of repo2',..])
var_RUNTIME_PACKAGES=
-var_PKG_FILE=$RUNTIME_DIR/package-list # not used by default in base/interactive. can be used by custom procedures or profiles for the automatic procedure
+var_PKG_FILE=$RUNTIME_DIR/aif-package-list # not used by default in base/interactive. can be used by custom procedures or profiles for the automatic procedure
var_MIRRORLIST="/etc/pacman.d/mirrorlist"
var_UI_TYPE="cli" # set to cli or dia for dialog
var_ARCH=`uname -m` #i686 or x86_64. NOTE: this assumes you want to install the same arch as the installation environment you're using. maybe we could decouple those someday..