aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2012-08-08 08:25:31 +0000
committerPascal Terjan <pterjan@mageia.org>2012-08-08 08:25:31 +0000
commit3d38ad213d980c08fe4c207ed7d925d9784e8f84 (patch)
tree099f15aa5b220c4acda99932ccc48ba2b51f9290
parent117ba04c1364d43c8c516de7b49e0e3cd6f5f892 (diff)
downloadiurt-3d38ad213d980c08fe4c207ed7d925d9784e8f84.tar
iurt-3d38ad213d980c08fe4c207ed7d925d9784e8f84.tar.gz
iurt-3d38ad213d980c08fe4c207ed7d925d9784e8f84.tar.bz2
iurt-3d38ad213d980c08fe4c207ed7d925d9784e8f84.tar.xz
iurt-3d38ad213d980c08fe4c207ed7d925d9784e8f84.zip
Use a shared option to set chroots location
-rwxr-xr-xiurt215
1 files changed, 5 insertions, 10 deletions
diff --git a/iurt2 b/iurt2
index a0f10ac..bdf94e2 100755
--- a/iurt2
+++ b/iurt2
@@ -441,10 +441,6 @@ my %config_usage = (
'curl',
]
},
- btrfs_base => {
- desc => 'Where to create btrfs subvolumes',
- default => $HOME
- },
build_timeout => {
desc => 'Maximum build time after which the build process is terminated',
default => {
@@ -463,6 +459,10 @@ my %config_usage = (
desc => 'Packages rebuild should be checked, however sometime rpm is segfaulting and the test is not correct',
default => 0
},
+ chroot_base => {
+ desc => 'Where to store chroots',
+ default => $HOME
+ },
iurt_root_command => {
desc => 'Program to run sudo command',
default => '/usr/sbin/iurt_root_command'
@@ -696,12 +696,7 @@ my (%done, $done);
$run{done} = \%done;
my $home = $config->{local_home};
-my $chroot_base;
-if ($run{storage} eq 'btrfs') {
- $chroot_base = $config->{btrfs_base};
-} else {
- $chroot_base = $config->{local_home};
-}
+my $chroot_base = $config->{chroot_base};
my ($chroot_name, $chroot_tmp, $chroot, $chroot_ref);
$chroot_name = "chroot_$run{distro_tag}$debug_tag.$run{my_arch}";
if (!$run{use_old_chroot}) {