Changeset 557


Ignore:
Timestamp:
Sep 24, 2008, 12:23:42 AM (11 years ago)
Author:
bruno
Message:
  • Adds documentation on QEMU
  • Fix pb to improve website delivery
Location:
devel
Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r556 r557  
    228228
    229229Announce the availability of the project through various means
     230
     231=back
     232
     233=item B<web2ssh>
     234
     235Deliver the Web site content to the target server using ssh.
    230236
    231237=back
     
    444450    # For announce only. Require avoids the systematic load of these modules
    445451    require DBI;
     452    require DBD::SQLite;
    446453
    447454    pb_announce();
    448455} elsif ($action =~ /^web2ssh$/) {
    449456    require DBI;
     457    require DBD::SQLite;
    450458
    451459    pb_cms2build("Web");
     
    462470    my $pkg;
    463471    my @pkgs;
     472    my $webdir;
     473
     474    my %pkgs;
     475    my %pb;             # Structure to store conf info
    464476
    465477    # If Website, then pkg is only the website
    466478    if ((defined $param) && ($param eq "Web")) {
    467         my $webdir = pb_conf_get("webdir");
    468         @pkgs = ($webdir->{$ENV{'PBPROJ'}});
     479        ($webdir) = pb_conf_get("webdir");
     480        pb_log(2,"webdir: ".Dumper($webdir)."\n");
     481        $pkgs[0] = $webdir->{$ENV{'PBPROJ'}};
    469482        $extpkgdir = $webdir;
    470         pb_log(0,"Packages: ".join(',',@pkgs)."\n");
     483        pb_log(0,"Package: $pkgs[0]\n");
    471484    } else {
    472485        $pkg = pb_cms_get_pkg($defpkgdir,$extpkgdir);
    473486        @pkgs = @$pkg;
    474487    }
    475 
    476     my %pkgs;
    477     my %pb;             # Structure to store conf info
    478488
    479489    my ($scheme, $uri) = pb_cms_init($pbinit);
     
    13561366            }
    13571367        if ($v =~ /x86_64/) {
    1358                 $vmcmd = "$qemucmd64 -no-kqemu";
     1368                $vmcmd = "$qemucmd64";
     1369                # Not needed with latest versions of qemu it seems
     1370                #$vmcmd = "$qemucmd64 -no-kqemu";
     1371                # This one may now be needed
     1372                #$vmcmd = "$qemucmd64 -no-kvm";
    13591373            } else {
    13601374                $vmcmd = "$qemucmd32";
Note: See TracChangeset for help on using the changeset viewer.