Mailinglist Archive: opensuse-buildservice (348 mails)
| < Previous | Next > |
[opensuse-buildservice] [PATCH 4/4] Cleanup VM worker disk setup options in bs_worker
- From: dl9pf@xxxxxx
- Date: Thu, 8 Apr 2010 03:19:09 +0200
- Message-id: <1270689549-25677-4-git-send-email-dl9pf@xxxxxx>
From: Jan-Simon Möller <jsmoeller@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Jan-Simon Möller <jsmoeller@xxxxxxxxxxxxxxxxxxx>
---
src/backend/bs_worker | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/backend/bs_worker b/src/backend/bs_worker
index 6f28609..2d85226 100755
--- a/src/backend/bs_worker
+++ b/src/backend/bs_worker
@@ -58,7 +58,6 @@ my $vm_root = '';
my $vm_swap = '';
my $vm_kernel;
my $vm_initrd;
-my $vmdisk_autosetup;
my $vmdisk_rootsize;
my $vmdisk_swapsize;
my $vmdisk_filesystem;
@@ -183,14 +182,11 @@ Usage: $0 [OPTION] --root <directory> --statedir
<directory>
--vm-initrd : set initrd to use (kvm)
- --vmdisk-autosetup
- : enable automatic (re-)setup of VM disks
-
--vmdisk-rootsize <size>
- : size of the root disk image (default 4G)
+ : size of the root disk image (default 4096M)
--vmdisk-swapsize <size>
- : size of the swap disk image (default 1G)
+ : size of the swap disk image (default 1024M)
--vmdisk-filesystem <none|ext3|ext4>
: filesystem to use for autosetup root disk image
@@ -307,11 +303,6 @@ while (@ARGV) {
$vm_initrd = shift @ARGV;
next;
}
- if ($ARGV[0] eq '--vmdisk-autosetup') {
- shift @ARGV;
- $vmdisk_autosetup = 1;
- next;
- }
if ($ARGV[0] eq '--vmdisk-rootsize') {
shift @ARGV;
$vmdisk_rootsize = shift @ARGV;
@@ -1374,7 +1365,6 @@ sub dobuild {
push @args, '--memory', $vmmemory if $vmmemory;
push @args, '--vm-kernel', $vm_kernel if $vm_kernel;
push @args, '--vm-initrd', $vm_initrd if $vm_initrd;
- push @args, '--vmdisk-autosetup' if $vmdisk_autosetup;
push @args, '--vmdisk-rootsize', $vmdisk_rootsize if $vmdisk_rootsize;
push @args, '--vmdisk-swapsize', $vmdisk_swapsize if $vmdisk_swapsize;
push @args, '--vmdisk-filesystem', $vmdisk_filesystem if
$vmdisk_filesystem;
--
1.6.4.2
--
To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-buildservice+help@xxxxxxxxxxxx
Signed-off-by: Jan-Simon Möller <jsmoeller@xxxxxxxxxxxxxxxxxxx>
---
src/backend/bs_worker | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/backend/bs_worker b/src/backend/bs_worker
index 6f28609..2d85226 100755
--- a/src/backend/bs_worker
+++ b/src/backend/bs_worker
@@ -58,7 +58,6 @@ my $vm_root = '';
my $vm_swap = '';
my $vm_kernel;
my $vm_initrd;
-my $vmdisk_autosetup;
my $vmdisk_rootsize;
my $vmdisk_swapsize;
my $vmdisk_filesystem;
@@ -183,14 +182,11 @@ Usage: $0 [OPTION] --root <directory> --statedir
<directory>
--vm-initrd : set initrd to use (kvm)
- --vmdisk-autosetup
- : enable automatic (re-)setup of VM disks
-
--vmdisk-rootsize <size>
- : size of the root disk image (default 4G)
+ : size of the root disk image (default 4096M)
--vmdisk-swapsize <size>
- : size of the swap disk image (default 1G)
+ : size of the swap disk image (default 1024M)
--vmdisk-filesystem <none|ext3|ext4>
: filesystem to use for autosetup root disk image
@@ -307,11 +303,6 @@ while (@ARGV) {
$vm_initrd = shift @ARGV;
next;
}
- if ($ARGV[0] eq '--vmdisk-autosetup') {
- shift @ARGV;
- $vmdisk_autosetup = 1;
- next;
- }
if ($ARGV[0] eq '--vmdisk-rootsize') {
shift @ARGV;
$vmdisk_rootsize = shift @ARGV;
@@ -1374,7 +1365,6 @@ sub dobuild {
push @args, '--memory', $vmmemory if $vmmemory;
push @args, '--vm-kernel', $vm_kernel if $vm_kernel;
push @args, '--vm-initrd', $vm_initrd if $vm_initrd;
- push @args, '--vmdisk-autosetup' if $vmdisk_autosetup;
push @args, '--vmdisk-rootsize', $vmdisk_rootsize if $vmdisk_rootsize;
push @args, '--vmdisk-swapsize', $vmdisk_swapsize if $vmdisk_swapsize;
push @args, '--vmdisk-filesystem', $vmdisk_filesystem if
$vmdisk_filesystem;
--
1.6.4.2
--
To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-buildservice+help@xxxxxxxxxxxx
| < Previous | Next > |