From: Daniel Hokka Zakrisson Date: Thu, 18 Jan 2007 13:38:06 +0000 (+0000) Subject: Add support for setting sysctl values in the configuration. X-Git-Tag: release-0.30.214~147 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08cf141b4557892740d357c523fe8ed74be39bcb;p=util-vserver.git Add support for setting sysctl values in the configuration. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2458 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/contrib/manifest.dat.pathsubst b/contrib/manifest.dat.pathsubst index 8022b7d..bb4fa69 100644 --- a/contrib/manifest.dat.pathsubst +++ b/contrib/manifest.dat.pathsubst @@ -74,6 +74,7 @@ build @PKGLIBDIR@/vserver-build sysv @PKGLIBDIR@/vserver-wrapper base @PKGLIBDIR@/vshelper base @PKGLIBDIR@/vshelper-sync +base @PKGLIBDIR@/vsysctl sysv @PKGLIBDIR@/vsysvwrapper @ENSC_HAVE_C99_COMPILER_TRUE@build @PKGLIBDIR@/vcopy @ENSC_HAVE_C99_COMPILER_TRUE@build @PKGLIBDIR@/vunify diff --git a/scripts/util-vserver-vars.pathsubst b/scripts/util-vserver-vars.pathsubst index dbefd9b..8c1e4c2 100644 --- a/scripts/util-vserver-vars.pathsubst +++ b/scripts/util-vserver-vars.pathsubst @@ -95,6 +95,7 @@ _VSERVERKILLALL="$__LEGACYDIR/vserverkillall" _VSHELPER="$__PKGLIBDIR/vshelper" _VSHELPER_SYNC="$__PKGLIBDIR/vshelper-sync" _VSOMETHING="$__SBINDIR/vsomething" +_VSYSCTL="$__PKGLIBDIR/vsysctl" _VWAIT="$__SBINDIR/vwait" _VUNAME="$__SBINDIR/vuname" _VUNIFY="$__PKGLIBDIR/vunify" diff --git a/scripts/vserver.start b/scripts/vserver.start index e1c5379..7dda3e6 100644 --- a/scripts/vserver.start +++ b/scripts/vserver.start @@ -136,6 +136,7 @@ if $_VSERVER_INFO - FEATURE migrate; then ${USE_VNAMESPACE:+$_VNAMESPACE --set -- } \ $_VLIMIT --dir "$VSERVER_DIR"/rlimits --missingok -- \ $_VSCHED --xid self --force "${OPTS_VSCHED[@]}" -- \ + $_VSYSCTL --xid self --dir "$VSERVER_DIR"/sysctl -- \ $_VUNAME --xid self --dir "$VSERVER_DIR"/uts --missingok -- \ "${VSERVER_EXTRA_CMDS[@]}" \ $_VUNAME --xid self --set -t context="$VSERVER_DIR" -- \ diff --git a/src/Makefile-files b/src/Makefile-files index 4e101c7..a518626 100644 --- a/src/Makefile-files +++ b/src/Makefile-files @@ -78,7 +78,8 @@ DIETPROGS += src/chcontext-compat \ src/ncontext \ src/nattribute \ src/naddress \ - src/vdevmap + src/vdevmap \ + src/vsysctl if ENSC_CAN_BEECRYPT_WITH_DIETLIBC DIETPROGS += src/vhashify @@ -115,6 +116,7 @@ pkglib_PROGRAMS += src/capchroot \ src/vshelper-sync \ src/sigexec \ src/chbind-compat \ + src/vsysctl \ $(src_pkglib_C99_X_PROGS) \ $(src_pkglib_CXX_X_PROGS) @@ -325,6 +327,10 @@ src_vdevmap_SOURCES = src/vdevmap.c src_vdevmap_LDADD = $(VSERVER_LDADDS) $(LIBINTERNAL) src_vdevmap_LDFLAGS = $(VSERVER_LDFLGS) +src_vsysctl_SOURCES = src/vsysctl.c +src_vsysctl_LDADD = $(VSERVER_LDADDS) +src_vsysctl_LDFLAGS = $(VSERVER_LDFLGS) + EXTRA_PROGRAMS += $(src_sbin_CXX_PROGS) $(src_pkglib_CXX_PROGS) TESTS_ENVIRONMENT += srctestsuitedir=$(top_builddir)/src/testsuite diff --git a/src/vsysctl.c b/src/vsysctl.c new file mode 100644 index 0000000..f0fd9b3 --- /dev/null +++ b/src/vsysctl.c @@ -0,0 +1,171 @@ +// $Id$ --*- c -*-- + +// 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. + + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include "util.h" +#include + +#include + +#include +#include +#include +#include +#include +#include + +#define ENSC_WRAPPERS_PREFIX "vsysctl: " +#define ENSC_WRAPPERS_UNISTD 1 +#define ENSC_WRAPPERS_FCNTL 1 +#define ENSC_WRAPPERS_DIRENT 1 +#define ENSC_WRAPPERS_VSERVER 1 +#define ENSC_WRAPPERS_IO 1 +#include + + +#define PROC_SYS_DIRECTORY "/proc/sys" + + +#define CMD_HELP 0x1000 +#define CMD_VERSION 0x1001 +#define CMD_XID 0x4000 +#define CMD_DIR 0x4001 + +int wrapper_exit_code = 1; + +struct option const +CMDLINE_OPTIONS[] = { + { "help", no_argument, 0, CMD_HELP }, + { "version", no_argument, 0, CMD_VERSION }, + { "xid", required_argument, 0, CMD_XID }, + { "dir", required_argument, 0, CMD_DIR }, + {0,0,0,0} +}; + +static void +showHelp(int fd, char const *cmd) +{ + WRITE_MSG(fd, "Usage: "); + WRITE_STR(fd, cmd); + WRITE_MSG(fd, + " --xid --dir -- *\n" + "\n" + "Please report bugs to " PACKAGE_BUGREPORT "\n"); + + exit(0); +} + +static void +showVersion() +{ + WRITE_MSG(1, + "vsysctl " VERSION " -- sets sysctl values during guest boot\n" + "This program is part of " PACKAGE_STRING "\n\n" + "Copyright (C) 2007 Daniel Hokka Zakrisson\n" + VERSION_COPYRIGHT_DISCLAIMER); + exit(0); +} + +void handle_setting(const char *dir, const char *name) +{ + int len_dir = strlen(dir), len_name = strlen(name); + char filename[len_dir+1+len_name+sizeof("/setting")]; + char setting[128], value[128], *ptr; + int fd; + size_t setting_len, value_len; + + strcpy(filename, dir); + *(filename+len_dir) = '/'; + strcpy(filename+len_dir+1, name); + +#define READFILE(f) \ + strcpy(filename+len_dir+1+len_name, "/" #f); \ + fd = EopenD(filename, O_RDONLY, 0); \ + f##_len = Eread(fd, f, sizeof(f)); \ + if (f##_len == sizeof(f)) { \ + errno = EOVERFLOW; \ + perror(ENSC_WRAPPERS_PREFIX "read"); \ + exit(EXIT_FAILURE); \ + } \ + f[f##_len] = '\0'; \ + Eclose(fd); + + READFILE(setting); + READFILE(value); + + /* replace all . with / in setting to get a filename */ + for (ptr = strchr(setting, '.'); ptr; ptr = strchr(ptr, '.')) + *ptr = '/'; + + /* we just want the first line, and not the linefeed */ + if ((ptr = strchr(setting, '\n')) == NULL) + *ptr = '\0'; + + fd = EopenD(setting, O_WRONLY, 0); + EwriteAll(fd, value, value_len); + Eclose(fd); +} + +int main(int argc, char *argv[]) +{ + xid_t xid = VC_NOCTX; + const char *dir = NULL; + + while (1) { + int c = getopt_long(argc, argv, "+", CMDLINE_OPTIONS, 0); + if (c==-1) break; + + switch (c) { + case CMD_HELP : showHelp(1, argv[0]); + case CMD_VERSION : showVersion(); + case CMD_XID : xid = Evc_xidopt2xid(optarg, true); break; + case CMD_DIR : dir = optarg; break; + + default : + WRITE_MSG(2, "Try '"); + WRITE_STR(2, argv[0]); + WRITE_MSG(2, " --help' for more information.\n"); + return EXIT_FAILURE; + break; + } + } + + if (dir != NULL) { + int curdir = EopenD(".", O_RDONLY, 0); + DIR *dp; + struct dirent *de; + + Echdir(PROC_SYS_DIRECTORY); + + dp = Eopendir(dir); + while ((de = Ereaddir(dp)) != NULL) { + if (*de->d_name == '.') + continue; + handle_setting(dir, de->d_name); + } + Eclosedir(dp); + + Efchdir(curdir); + } + + Eexecvp(argv[optind], argv+optind); + return EXIT_FAILURE; +}