From ff6233a5943bd227f7a72a85877551f0d34ae379 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Tue, 14 Oct 2003 02:39:50 +0000 Subject: [PATCH] This commit was manufactured by cvs2svn to create tag 'version_0_23_6'. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/tags/version_0_23_6@133 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/.cvsignore | 3 ++- util-vserver/NEWS | 5 +++++ util-vserver/configure.ac | 2 +- util-vserver/lib/.cvsignore | 2 ++ util-vserver/scripts/.cvsignore | 1 + util-vserver/scripts/vserver | 10 +++++----- util-vserver/src/.cvsignore | 23 +++++++++++++++++++++++ util-vserver/src/rebootmgr.c | 2 +- util-vserver/sysv/.cvsignore | 10 ++++++++++ util-vserver/sysv/Makefile-files | 2 +- util-vserver/tests/.cvsignore | 8 ++++++++ util-vserver/vserver.spec.in | 12 +++++++++--- 12 files changed, 68 insertions(+), 12 deletions(-) create mode 100644 util-vserver/lib/.cvsignore create mode 100644 util-vserver/scripts/.cvsignore create mode 100644 util-vserver/src/.cvsignore create mode 100644 util-vserver/sysv/.cvsignore create mode 100644 util-vserver/tests/.cvsignore diff --git a/util-vserver/.cvsignore b/util-vserver/.cvsignore index ffa3457..8671522 100644 --- a/util-vserver/.cvsignore +++ b/util-vserver/.cvsignore @@ -1,8 +1,9 @@ -.X_usr_local_etc-up-to-date +.*-up-to-date .deps COPYING ChangeLog INSTALL +Makefile aclocal.m4 autom4te.cache compile diff --git a/util-vserver/NEWS b/util-vserver/NEWS index e69de29..7ee1e84 100644 --- a/util-vserver/NEWS +++ b/util-vserver/NEWS @@ -0,0 +1,5 @@ +version 0.23.6 +============== + + - fixed '--level' option on 'vserver ... chkconfig' + - fixed built in sysv (broken sed invocation) diff --git a/util-vserver/configure.ac b/util-vserver/configure.ac index 5e7b319..e9b6ed5 100644 --- a/util-vserver/configure.ac +++ b/util-vserver/configure.ac @@ -24,7 +24,7 @@ dnl distribution terms that you use for the rest of that program. dnl AC_PREREQ(2.57) -AC_INIT(util-vserver, 0.23.5, enrico.scholz@informatik.tu-chemnitz.de) +AC_INIT(util-vserver, 0.23.6, enrico.scholz@informatik.tu-chemnitz.de) AC_CONFIG_SRCDIR([src/capchroot.c]) AC_CONFIG_HEADER([config.h]) diff --git a/util-vserver/lib/.cvsignore b/util-vserver/lib/.cvsignore new file mode 100644 index 0000000..ec96903 --- /dev/null +++ b/util-vserver/lib/.cvsignore @@ -0,0 +1,2 @@ +.deps +.dirstamp diff --git a/util-vserver/scripts/.cvsignore b/util-vserver/scripts/.cvsignore new file mode 100644 index 0000000..61478f9 --- /dev/null +++ b/util-vserver/scripts/.cvsignore @@ -0,0 +1 @@ +util-vserver-vars diff --git a/util-vserver/scripts/vserver b/util-vserver/scripts/vserver index c40eaf1..1a80cda 100755 --- a/util-vserver/scripts/vserver +++ b/util-vserver/scripts/vserver @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright (C) 2003 Enrico Scholz # based on vserver by Jacques Gelinas @@ -737,17 +737,17 @@ elif [ "$2" = "service" ] ; then exec $0 $NODEV $SILENT $VSERVER exec /sbin/service "$@" elif [ "$2" = "chkconfig" ] ; then VSERVER=$1 + LEVELS=() shift shift if [ "$1" = "--level" ] ; then - shift - LEVELS=$1 - shift + LEVELS=( --level "$2" ) + shift 2 fi if [ $# != 2 -a ! -x /vservers/$VSERVER/sbin/chkconfig ] ; then echo Invalid argument, expected vserver name chkconfig [ --level nnn ] service on\|off elif [ -x /vservers/$VSERVER/sbin/chkconfig ] ; then - exec $0 --silent $VSERVER exec /sbin/chkconfig "$@" + exec $0 --silent $VSERVER exec /sbin/chkconfig "${LEVELS[@]}" "$@" elif [ -x /vservers/$VSERVER/usr/sbin/update-rc.d ] ; then if [ "$2" = "on" -o "$2" = "start" ] ; then $0 --silent $VSERVER exec /usr/sbin/update-rc.d -f $1 remove >/dev/null diff --git a/util-vserver/src/.cvsignore b/util-vserver/src/.cvsignore new file mode 100644 index 0000000..63d3635 --- /dev/null +++ b/util-vserver/src/.cvsignore @@ -0,0 +1,23 @@ +.deps +.dirstamp +capchroot +chbind +chcontext +fakerunlevel +filetime +ifspec +listdevip +parserpmdump +readlink +rebootmgr +reducecap +setctxlimit +showattr +showperm +vbuild +vcheck +vdu +vfiles +vreboot +vserver-stat +vunify diff --git a/util-vserver/src/rebootmgr.c b/util-vserver/src/rebootmgr.c index 8e9570e..47420b5 100644 --- a/util-vserver/src/rebootmgr.c +++ b/util-vserver/src/rebootmgr.c @@ -197,7 +197,7 @@ int main (int argc, char *argv[]) int fd = sockets[i]; if (FD_ISSET(fd,&fdin)){ struct sockaddr_un unc; - size_t len = sizeof(unc); + socklen_t len = sizeof(unc); unc.sun_family = AF_UNIX; fd = accept (fd,(struct sockaddr*)&unc,&len); if (fd != -1){ diff --git a/util-vserver/sysv/.cvsignore b/util-vserver/sysv/.cvsignore new file mode 100644 index 0000000..80bab4b --- /dev/null +++ b/util-vserver/sysv/.cvsignore @@ -0,0 +1,10 @@ +rebootmgr +v_gated +v_httpd +v_named +v_portmap +v_sendmail +v_smb +v_sshd +v_xinetd +vservers diff --git a/util-vserver/sysv/Makefile-files b/util-vserver/sysv/Makefile-files index 6601c4e..c1aaf13 100644 --- a/util-vserver/sysv/Makefile-files +++ b/util-vserver/sysv/Makefile-files @@ -46,7 +46,7 @@ sysv_CFG = sysv/vservers.conf sysv/%: sysv/%.subst @mkdir -p $$(dirname '$@') - sed -s 's!/usr/lib/util-vserver!$(pkglibdir)!g; \ + sed -e 's!/usr/lib/util-vserver!$(pkglibdir)!g; \ s!^USR_SBIN=/usr/sbin$$!USR_SBIN=$(sbindir)!g' '$<' >'$@.tmp' if cmp -s '$<' '$@.tmp'; then \ cp -p '$<' '$@'; \ diff --git a/util-vserver/tests/.cvsignore b/util-vserver/tests/.cvsignore new file mode 100644 index 0000000..0667ff3 --- /dev/null +++ b/util-vserver/tests/.cvsignore @@ -0,0 +1,8 @@ +.deps +.dirstamp +chrootsafe +escaperoot +forkbomb +testipc +testlimit +testopenf diff --git a/util-vserver/vserver.spec.in b/util-vserver/vserver.spec.in index 5334add..fca1022 100644 --- a/util-vserver/vserver.spec.in +++ b/util-vserver/vserver.spec.in @@ -1,11 +1,12 @@ Summary: Linux virtual server utilities Name: @PACKAGE@ Version: @VERSION@ -Release: 1 +Release: 0 Epoch: 0 Copyright: GPL Group: System Environment/Base -Source: %name-%version.tar.bz2 +URL: http://savannah.nongnu.org/projects/util-vserver/ +Source0: http://savannah.nongnu.org/download/util-vserver/stable.pkg/%version/%name-%version.tar.bz2 Provides: %name-devel = %epoch:%version-%release BuildRoot: %_tmppath/%name-%version-%release-root Provides: vserver = %epoch:%version-%release @@ -36,6 +37,11 @@ set_ipv4root system call. rm -rf $RPM_BUILD_ROOT %__make DESTDIR=$RPM_BUILD_ROOT install +test "%_initrddir" = %_sysconfdir/init.d || { + mkdir -p ${RPM_BUILD_ROOT}%_initrddir + mv ${RPM_BUILD_ROOT}%_sysconfdir/init.d/* ${RPM_BUILD_ROOT}%_initrddir/ +} + %clean rm -rf $RPM_BUILD_ROOT @@ -74,7 +80,7 @@ test "$1" = 0 || %{_initrddir}/rebootmgr condrestart >/dev/null || : %_includedir/vserver.h %_libdir/libvserver.a %_mandir/man8/* -%config /etc/init.d/* +%config %_initrddir/* %config(noreplace) /etc/vservers/newvserver.defaults %config(noreplace) /etc/vservers.conf -- 1.8.1.5