Changeset 534

Show
Ignore:
Timestamp:
02/19/07 03:17:02 (2 years ago)
Author:
chtekk
Message:

Fix/update copyrights and copyright dates.
Rename vg.del method to vg.remove, rename vgc del command to remove.
Add vg.vx.{add,list,remove} methods and respective vgc commands.
Sync vcc/vce with vgc/vcdadm some more (handling of commands with no params is now the one from vgc/vcdadm).
Fix vcc templates, vcc list and vce list for previous change.
Make vce vx.sched.set mandate a valid cpuid (this aligns it with the vcd method!).
Update vx.remove wrt new groups system.
Fix numcpus check in helper.startup.
Misc style fixes.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/configure.ac

    r525 r534  
    1 # Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1# Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22# 
    33# This program is free software; you can redistribute it and/or modify 
  • trunk/src/Makefile.am

    r525 r534  
    1 ## Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1## Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22## 
    33## This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcc/Makefile.am

    r493 r534  
    1 ## Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1## Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22## 
    33## This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcc/cmd.c

    r493 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcc/cmd.h

    r493 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcc/create.c

    r484 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
     2//           2007 Luca Longinotti <chtekk@gentoo.org> 
    23// 
    34// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcc/exec.c

    r407 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcc/kill.c

    r486 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcc/list.c

    r524 r534  
    2323{ 
    2424        xmlrpc_value *response, *result; 
    25         char *username, *name
     25        char *username
    2626        int len, i; 
    27  
    28         if (argc < 1) 
    29                 username = ""; 
    30         else 
    31                 username = argv[0]; 
    3227 
    3328        response = xmlrpc_client_call(env, uri, "vxdb.list", 
    3429                SIGNATURE("{s:s}"), 
    35                 "username", username); 
     30                "username", name); 
    3631        return_if_fault(env); 
    3732 
     
    4338                return_if_fault(env); 
    4439 
    45                 xmlrpc_decompose_value(env, result, "s", &name); 
     40                xmlrpc_decompose_value(env, result, "s", &username); 
    4641                return_if_fault(env); 
    4742 
    4843                xmlrpc_DECREF(result); 
    4944 
    50                 printf("%s\n", name); 
     45                printf("%s\n", username); 
    5146        } 
    5247 
  • trunk/src/vcc/login.c

    r407 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcc/main.c

    r524 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
     
    4848               "\n" 
    4949               "Available commands:\n" 
    50                "   create  <name> <template> [<force> [<copy> [<vdir>]]]\n" 
    51                "   exec    <name> <command> <args>*\n" 
    52                "   kill    <name> <pid> <sig>\n" 
    53                "   list    [<username>]\n" 
    54                "   load    <name>\n" 
    55                "   login   <name>\n" 
    56                "   reboot  <name>\n" 
    57                "   remove  <name>\n" 
    58                "   rename  <name> <newname>\n" 
    59                "   start   <name>\n" 
    60                "   status  <name>\n" 
    61                "   stop    <name>\n" 
     50               "   create    <name> <template> [<force> [<copy> [<vdir>]]]\n" 
     51               "   exec      <name> <command> <args>*\n" 
     52               "   kill      <name> <pid> <sig>\n" 
     53               "   list      [<username>]\n" 
     54               "   load      <name>\n" 
     55               "   login     <name>\n" 
     56               "   reboot    <name>\n" 
     57               "   remove    <name>\n" 
     58               "   rename    <name> <newname>\n" 
     59               "   start     <name>\n" 
     60               "   status    <name>\n" 
     61               "   stop      <name>\n" 
    6262               "   templates [<name>]\n" 
    6363               "\n" 
     
    181181        cmd  = argv[optind++]; 
    182182 
    183         if (str_equal(cmd, "list") || str_equal(cmd, "templates")) 
    184                 name = NULL; 
    185         else if (argc < optind + 1) 
    186                 usage(EXIT_FAILURE); 
     183        if (argc < optind + 1) 
     184                name = ""; 
    187185        else 
    188186                name = argv[optind++]; 
  • trunk/src/vcc/reboot.c

    r407 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcc/remove.c

    r407 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcc/rename.c

    r484 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcc/restart.c

    r494 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcc/start.c

    r407 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcc/stop.c

    r407 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcc/templates.c

    r524 r534  
    2323{ 
    2424        xmlrpc_value *response, *result; 
    25         char *name, *description; 
     25        char *tplname, *description; 
    2626        int len, i; 
    27  
    28         if (argc < 1) 
    29                 name = ""; 
    30         else 
    31                 name = argv[0]; 
    3227 
    3328        response = xmlrpc_client_call(env, uri, "vx.templates", 
     
    4439 
    4540                xmlrpc_decompose_value(env, result, "{s:s,s:s,*}", 
    46                                 "name", &name, 
     41                                "name", &tplname, 
    4742                                "description", &description); 
    4843                return_if_fault(env); 
     
    5045                xmlrpc_DECREF(result); 
    5146 
    52                 printf("%s: %s\n", name, description); 
     47                printf("%s: %s\n", tplname, description); 
    5348        } 
    5449 
  • trunk/src/vcc/vlogin.c

    r524 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcd/Makefile.am

    r442 r534  
    1 ## Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1## Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22## 
    33## This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcd/auth.c

    r505 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcd/auth.h

    r442 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcd/cfg.c

    r524 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcd/cfg.h

    r469 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcd/lists.c

    r376 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcd/lists.h

    r351 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcd/main.c

    r500 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcd/methods.c

    r525 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
     
    9393 
    9494        /* vg */ 
    95         MREGISTER("vg.add",  m_vg_add); 
    96         MREGISTER("vg.del",  m_vg_del); 
    97         MREGISTER("vg.list", m_vg_list); 
     95        MREGISTER("vg.add",       m_vg_add); 
     96        MREGISTER("vg.list",      m_vg_list); 
     97        MREGISTER("vg.remove",    m_vg_remove); 
     98        MREGISTER("vg.vx.add",    m_vg_vx_add); 
     99        MREGISTER("vg.vx.list",   m_vg_vx_list); 
     100        MREGISTER("vg.vx.remove", m_vg_vx_remove); 
    98101 
    99102        /* vx */ 
  • trunk/src/vcd/methods.h

    r525 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
     
    137137/* vg */ 
    138138MPROTO(m_vg_add); 
    139 MPROTO(m_vg_del); 
    140139MPROTO(m_vg_list); 
     140MPROTO(m_vg_remove); 
     141MPROTO(m_vg_vx_add); 
     142MPROTO(m_vg_vx_list); 
     143MPROTO(m_vg_vx_remove); 
    141144 
    142145/* vx */ 
  • trunk/src/vcd/methods/Makefile.am

    r525 r534  
    1 ## Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1## Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22## 
    33## This program is free software; you can redistribute it and/or modify 
     
    3333 
    3434M_VG = vg/vg_add.c \ 
    35        vg/vg_del.c \ 
    36        vg/vg_list.c 
     35       vg/vg_list.c \ 
     36       vg/vg_remove.c \ 
     37       vg/vg_vx_add.c \ 
     38       vg/vg_vx_list.c \ 
     39       vg/vg_vx_remove.c 
    3740 
    3841M_VX = vx/vx_create.c \ 
  • trunk/src/vcd/methods/helper/helper_netup.c

    r497 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcd/methods/helper/helper_restart.c

    r452 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcd/methods/helper/helper_shutdown.c

    r497 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcd/methods/helper/helper_startup.c

    r520 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
     
    337337                        cpuid = vxdb_column_int(dbr, 0); 
    338338 
    339                         if (cpuid > numcpus) 
     339                        if (cpuid >= numcpus) 
    340340                                continue; 
    341341 
  • trunk/src/vcd/methods/vcd/vcd_login.c

    r458 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcd/methods/vcd/vcd_user_caps_add.c

    r457 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcd/methods/vcd/vcd_user_caps_get.c

    r505 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcd/methods/vcd/vcd_user_caps_remove.c

    r457 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcd/methods/vcd/vcd_user_get.c

    r509 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcd/methods/vcd/vcd_user_remove.c

    r525 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcd/methods/vcd/vcd_user_set.c

    r457 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcd/methods/vg/vg_add.c

    r526 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2007 Luca Longinotti <chtekk@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcd/methods/vg/vg_list.c

    r526 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2007 Luca Longinotti <chtekk@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcd/methods/vg/vg_remove.c

    r533 r534  
    2424#include <lucid/str.h> 
    2525 
    26 xmlrpc_value *m_vg_del(xmlrpc_env *env, xmlrpc_value *p, void *c) 
     26xmlrpc_value *m_vg_remove(xmlrpc_env *env, xmlrpc_value *p, void *c) 
    2727{ 
    2828        LOG_TRACEME 
     
    6262        } 
    6363 
     64        else 
     65                method_return_faultf(env, MEINVAL, 
     66                                "group doesn't exist: %s", group); 
     67 
    6468        return xmlrpc_nil_new(env); 
    6569} 
  • trunk/src/vcd/methods/vx/vx_create.c

    r533 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
     2//           2007 Luca Longinotti <chtekk@gentoo.org> 
    23// 
    34// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcd/methods/vx/vx_exec.c

    r524 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcd/methods/vx/vx_kill.c

    r380 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcd/methods/vx/vx_reboot.c

    r497 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
  • trunk/src/vcd/methods/vx/vx_remove.c

    r491 r534  
    1 // Copyright 2006 Benedikt Böhm <hollow@gentoo.org> 
     1// Copyright 2006-2007 Benedikt Böhm <hollow@gentoo.org> 
    22// 
    33// This program is free software; you can redistribute it and/or modify 
     
    6464                        "DELETE FROM vx_sched     WHERE xid = %d;" 
    6565                        "DELETE FROM vx_uname     WHERE xid = %d;" 
     66                        "DELETE FROM xid_gid_map  WHERE xid = %d;" 
    6667                        "DELETE FROM xid_name_map WHERE xid = %d;" 
    67                         "DELETE FROM xid_uid_map  WHERE xid = %d;" /* 15 */ 
     68                        "DELETE FROM xid_uid_map  WHERE xid = %d;" /* 16 */ 
    6869                        "COMMIT TRANSACTION;", 
    69                         xid, xid, xid, xid, xid, xid, xid,