proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-12 22:36:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lxc_clone.c: Allow size subfixes for -L parameter

Browse Source 
lxc-clone ignores size subfixes (K, M, G) when using -L parameter. The
following is a quick patch to allow, for example, lxc-clone -L 10G.

Signed-off-by: Norberto Bensa <nbensa@gmail.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
zoolook 2013-07-11 20:38:02 -03:00 committed by Serge Hallyn
parent 283678ed2c
commit ae13ae0853
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/lxc/lxc_clone.c
View File

@ -6,6 +6,7 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <ctype.h>
#include "log.h" #include "log.h"
#include "config.h" #include "config.h"
@ -16,6 +17,27 @@
lxc_log_define(lxc_clone, lxc); lxc_log_define(lxc_clone, lxc);
static unsigned long get_fssize(char *s)
{
unsigned long ret;
char *end;
ret = strtoul(s, &end, 0);
if (end == s)
return 0;
while (isblank(*end))
end++;
if (!(*end))
return ret;
if (*end == 'g' || *end == 'G')
ret *= 1000000000;
else if (*end == 'm' || *end == 'M')
ret *= 1000000;
else if (*end == 'k' || *end == 'K')
ret *= 1000;
return ret;
}
void usage(const char *me) void usage(const char *me)
{ {
printf("Usage: %s [-s] [-B backingstore] [-L size] [-K] [-M] [-H]\n", me); printf("Usage: %s [-s] [-B backingstore] [-L size] [-K] [-M] [-H]\n", me);
@ -73,7 +95,7 @@ int main(int argc, char *argv[])
switch (c) { switch (c) {
case 's': snapshot = 1; break; case 's': snapshot = 1; break;
case 'B': bdevtype = optarg; break; case 'B': bdevtype = optarg; break;
case 'L': newsize = atol(optarg); break; case 'L': newsize = get_fssize(optarg); break;
case 'o': orig = optarg; break; case 'o': orig = optarg; break;
case 'n': new = optarg; break; case 'n': new = optarg; break;
case 'v': vgname = optarg; break; case 'v': vgname = optarg; break;