change `pacman -Sy` to `-Syy`, cleanup whitespace

[aab.git] / PVE / AAB.pm

diff --git a/PVE/AAB.pm b/PVE/AAB.pm
index 44370e1e697cde0e27d16ab015037332ed108f5d..77410adf6bd2b4d59fc6e97d39b64ca8fa1f66ab 100644 (file)
--- a/PVE/AAB.pm
+++ b/PVE/AAB.pm
@@ -101,7 +101,7 @@ sub read_config {
            my $long = $2;
            $long =~ s/^\s+/ /;
            $res->{description} = $long;
-           chomp $res->{description};      
+           chomp $res->{description};
        } elsif ($rec =~ s/^([^:]+):\s*(.*\S)\s*\n//) {
            my ($key, $value) = (lc ($1), $2);
            if ($key eq 'source' || $key eq 'mirror') {
@@ -117,6 +117,8 @@ sub read_config {
 
     die "unable to parse config file" if $rec;
 
+    $res->{architecture} = 'amd64' if $res->{architecture} eq 'x86_64';
+
     return $res;
 }
 
@@ -131,7 +133,7 @@ sub new {
     die "no 'maintainer' specified\n" if !$config->{maintainer};
 
     my $name = $config->{name} || die "no 'name' specified\n";
-    $name =~ m/^[a-z][0-9a-z\-\*\.]+$/ || 
+    $name =~ m/^[a-z][0-9a-z\-\*\.]+$/ ||
        die "illegal characters in name '$name'\n";
 
     my $targetname;
@@ -166,8 +168,8 @@ sub __sample_config {
     return <<"CFG";
 lxc.arch = $arch
 lxc.include = /usr/share/lxc/config/archlinux.common.conf
-lxc.utsname = localhost
-lxc.rootfs = $self->{rootfs}
+lxc.uts.name = localhost
+lxc.rootfs.path = $self->{rootfs}
 lxc.mount.entry = $self->{pkgcache} $self->{pkgdir} none bind 0 0
 CFG
 }
@@ -236,10 +238,12 @@ sub initialize {
 
     $fh = IO::File->new($self->{'pacman.conf'}, O_WRONLY|O_CREAT|O_EXCL) ||
        die "unable to write pacman config file $self->{'pacman.conf'} - $!";
+    my $arch = $config->{architecture};
+    $arch = 'x86_64' if $arch eq 'amd64';
     print $fh <<"EOF";
 [options]
 HoldPkg = pacman glibc
-Architecture = $config->{architecture}
+Architecture = $arch
 CheckSpace
 SigLevel = Never
 
@@ -284,7 +288,7 @@ sub ve_status {
        }
     }
     close($fh);
-    
+
     return $res;
 }
 
@@ -314,7 +318,7 @@ sub ve_init {
     my $vestat = $self->ve_status();
     if ($vestat->{running}) {
        $self->run_command ("lxc-stop -n $veid --rcfile $conffile --kill");
-    } 
+    }
 
     rmtree $self->{rootfs};
     mkpath $self->{rootfs};
@@ -379,8 +383,8 @@ sub run_command {
     # catch exec errors
     if ($orig_pid != $$) {
        $self->logmsg ("ERROR: command '$cmdstr' failed - fork failed\n");
-       POSIX::_exit (1); 
-       kill ('KILL', $$); 
+       POSIX::_exit (1);
+       kill ('KILL', $$);
     }
 
     die $err if $err;
@@ -462,7 +466,7 @@ sub bootstrap {
     mkpath $self->{pkgcache};
     mkpath $self->{pkgdir};
     mkpath "$root/var/lib/pacman";
-    $self->run_command([@pacman, '-Sy']);
+    $self->run_command([@pacman, '-Syy']);
 
     print "Figuring out what to install...\n";
     my $incl = { map { $_ => 1 } @{$self->{incl}} };