X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Ffunctions;fp=scripts%2Ffunctions;h=a8f451d22b9df0b8c780b92c13c4b31465a445d5;hb=2822ba293eb308225c50d346930c47bf98d9927b;hp=d2e00d374c8d8c3514e9e5558ec3fd85e1bd9b4d;hpb=2894fc5a4c8335e4d7221311fed0556f33f8047c;p=util-vserver.git

diff --git a/scripts/functions b/scripts/functions
index d2e00d3..a8f451d 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -1,6 +1,6 @@
-# $Id: functions 2420 2006-12-09 16:02:03Z dhozac $	--*- sh -*--
+# $Id: functions,v 1.62 2005/07/03 17:42:49 ensc Exp $	--*- sh -*--
 
-# Copyright (C) 2003,2004,2005,2006 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 #  
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -84,29 +84,6 @@ function getPhysicalDir
     ( set -P && cd "$1" && pwd )
 }
 
-## Usage:: isDirectoryEmpty <dir> [<ignore-lost+found>]
-function isDirectoryEmpty
-{
-    (
-	shopt -s dotglob  || *
-	shopt -s nullglob || *
-
-	ignore_lostfound=1
-	test -z "$2" -o "$2" = 0 || ignore_lostfound=
-	
-	for i in "$1"/*; do
-	    case "$i" in
-		($1/lost+found)
-		    test "$ignore_lostfound" || exit 1
-		    ;;
-		(*)	echo "$i"; exit 1
-	    esac
-        done
-
-	exit 0
-    )
-}
-
 ## Usage: logging <message>
 function logging
 {
@@ -203,34 +180,11 @@ function colorize
 	  esac
 	fi
 	    
-	( "$@" )
+	"$@"
 	echo -ne "\e[m"
     fi
 }
 
-function colpanic
-{
-    if test -n "$_VS_ERRFILE"; then
-	echo "$@" >>"$_VS_ERRFILE"
-    else
-	colorize error echo -n "$@" >&2
-    fi
-    echo
-
-    exit 1
-}
-
-function colwarning
-{
-    colorize warning warning "$@"
-}
-
-function colinfo
-{
-    colorize info    echo "$@"
-}
-
-
 ## Usage: xtermTitle <title>
 function xtermTitle
 {
@@ -242,7 +196,7 @@ _VS_LOCKS=''
 ## Usage: lock <lockfile> [<timeout>]
 function lock
 {
-    local tmp=$($_MKTEMP vserver-lock.XXXXXX)
+    local tmp=$($_MKTEMP /tmp/vserver-lock.XXXXXX)
     $_RM -f $tmp
     $_MKFIFO -m600 $tmp
 
@@ -268,30 +222,6 @@ function unlock
     _VS_LOCKS="$@"
 }
 
-function get_init_cwd
-{
-    if test -n "$INIT_CWD"; then
-	echo "$INIT_CWD"
-    else
-	pwd
-    fi
-}
-function set_init_cwd
-{
-    INIT_CWD="`pwd`"
-    export INIT_CWD
-}
-
-function _getVserverDir
-{
-    local vserver="$1"
-    case "$vserver" in
-	./*) VSERVER_DIR="`get_init_cwd`/$vserver";;
-	/*)  VSERVER_DIR="$vserver"               ;;
-	*)   VSERVER_DIR="$__CONFDIR/$vserver"    ;;
-    esac
-}
-
 function _pkgMountBindDir()
 {
     test "$1" != "$2" || return 0
@@ -504,18 +434,6 @@ function isAvoidNamespace
          -e "$cfgdir"/nonamespace
 }
 
-function isNamespaceCleanup
-{
-    local cfgdir
-
-    $_VSERVER_INFO - FEATURE namespace   || return 1
-    cfgdir=$($_VSERVER_INFO "$1" CFGDIR) || return 1
-    test -e "$cfgdir"/namespace-cleanup  && return 0
-    test -e "$cfgdir"/nonamespace-cleanup -o \
-         -e "$__CONFDIR"/.defaults/nonamespace-cleanup && return 1
-    return 0
-}
-
 ## Usage: getAllVservers <var> [<KIND>*]
 function getAllVservers
 {
@@ -636,17 +554,13 @@ function getFileValue
     eval read "$_gfv_var" <"$_gfv_file"
 }
 
-## Called as 'getFileArray <varname> <filename>+'
+## Called as 'getFileArray <varname> <filename>'
 function getFileArray
 {
-    local _gfa_var=$1
-    local _gfa_file
-    shift
-
-    findFile _gfa_file "$@" ''
-    test -n "$_gfa_file" -a -r "$_gfa_file" || return 0
+    test -r "$2" || return 1
+    
     local IFS=$_VS_NEWLINE
-    eval "$_gfa_var"='( $(< "$_gfa_file") )'
+    eval "$1"='( $(< "$2") )'
 }
 
 function checkComponents
@@ -729,11 +643,6 @@ function killContext
     #$_VKILL -s CONT   --xid "$1" 1 &>/dev/null || :
 }
 
-function useVlogin
-{
-    test ! -e "$__CONFDIR/.defaults/apps/vlogin/disable"
-}
-
 ## Usage: pkgmgmt.guessStyle <vserver> <resultvar>
 function pkgmgmt.guessStyle()
 {
@@ -1014,7 +923,7 @@ function vshelper.doDestroy
 function vshelper.initSync
 {
     local _vis_tmpdir
-    _vis_tmpdir=$($_MKTEMPDIR vserver-stop.XXXXXX) || {
+    _vis_tmpdir=$($_MKTEMPDIR /tmp/vserver-stop.XXXXXX) || {
 	warning $"Failed to generate temporary directory for vshelper sync"
 	return 1
     }
@@ -1037,30 +946,6 @@ function vshelper.getSyncTimeout
     eval $2=\$_vgst_tmp
 }
 
-function vshelper.initStopSync
-{
-	local _iss_sync_dir=$($_MKTEMPDIR vshelper-stop-sync.XXXXXX) || {
-		warning $"Failed to generate directory for vshelper sync"
-		exit 1
-	}
-	$_MKFIFO -m700 "$_iss_sync_dir/pipe"
-
-	eval "$1"=\$_iss_sync_dir
-	VSHELPER_STOP_SYNC="$_iss_sync_dir/pipe"
-	export VSHELPER_STOP_SYNC
-}
-
-function vshelper.waitForStopSync
-{
-	local sync_dir=$1
-	cat "$sync_dir/pipe" &> /dev/null
-	rm -fr "$sync_dir"
-}
-
-function vshelper.doStopSync
-{
-	test ! -p "$VSHELPER_STOP_SYNC" || echo stopped > "$VSHELPER_STOP_SYNC"
-}
 
 function _rpmFake.getCapFlags
 {