From: Daniel Hokka Zakrisson Date: Sun, 29 Jul 2007 17:14:37 +0000 (+0000) Subject: Only POSIX-sh in Gentoo initscripts. X-Git-Tag: release-0.30.214~33 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81b438ba5510581d95fc5daa253743143f50544b;p=util-vserver.git Only POSIX-sh in Gentoo initscripts. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2572 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/gentoo/Makefile-files b/gentoo/Makefile-files index fb03479..3701210 100644 --- a/gentoo/Makefile-files +++ b/gentoo/Makefile-files @@ -28,4 +28,5 @@ EXTRA_DIST += $(gentoo_src_SCRPTS) if HAVE_GENTOO_INIT initrd_SCRIPTS += $(gentoo_src_SCRPTS) +pkglib_SCRIPTS += gentoo/bash-wrapper endif diff --git a/gentoo/bash-wrapper b/gentoo/bash-wrapper new file mode 100755 index 0000000..80481be --- /dev/null +++ b/gentoo/bash-wrapper @@ -0,0 +1,66 @@ +#! /bin/bash +# $Id$ + +# Copyright (C) 2007 Daniel Hokka Zakrisson +# +# 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 +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} +test -e "$UTIL_VSERVER_VARS" || { + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2 + exit 1 +} +. "$UTIL_VSERVER_VARS" +. "$_LIB_FUNCTIONS" +. "$__PKGLIBDIR/vserver.functions" + + +function showHelp() +{ + echo \ +$"Usage: $0 + +Report bugs to <$PACKAGE_BUGREPORT>." + exit 0 +} + +function showVersion() +{ + echo \ +$"bash-wrapper $PACKAGE_VERSION -- wrapper for bash snippets for Gentoo initscripts +This program is part of $PACKAGE_STRING + +Copyright (C) 2007 Daniel Hokka Zakrisson +This program is free software; you may redistribute it under the terms of +the GNU General Public License. This program has absolutely no warranty." + exit 0 +} + +tmp=$(getopt -o +q --long help,version,debug -n "$0" -- "$@") || exit 1 +eval set -- "$tmp" + +while true; do + case "$1" in + (--help) showHelp $0 ;; + (--version) showVersion ;; + (--debug) set -x;; + (--) shift; break;; + (*) echo $"bash-wrapper: internal error; arg=='$1'" >&2; exit 1;; + esac + shift +done + +for i; do + eval $i +done diff --git a/gentoo/util-vserver b/gentoo/util-vserver index 1827326..715b84c 100644 --- a/gentoo/util-vserver +++ b/gentoo/util-vserver @@ -36,15 +36,13 @@ start() { fi source ${UTIL_VSERVER_VARS} - source "$_LIB_FUNCTIONS" - source "$__PKGLIBDIR/vserver.functions" ebegin "Setting vshelper path to $_VSHELPER" set_helper eend $? ebegin "Loading default device map" - loadDeviceMap 0 "$__CONFDIR/.defaults/apps/vdevmap" + $__PKGLIBDIR/bash-wrapper 'loadDeviceMap 0 "$__CONFDIR/.defaults/apps/vdevmap"' eend $? } @@ -57,8 +55,6 @@ stop() { fi source ${UTIL_VSERVER_VARS} - source "$_LIB_FUNCTIONS" - source "$__PKGLIBDIR/vserver.functions" ebegin "Stopping all running guests" $_START_VSERVERS -j 1 --all --stop