Changeset 223 for 0.8.5


Ignore:
Timestamp:
Oct 17, 2007, 11:32:14 AM (12 years ago)
Author:
Bruno Cornec
Message:
  • Use halt instead of poweroff unavailable on suse ut seems
  • die when no VM file found
Location:
0.8.5
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • 0.8.5/pb/bin/pb

    r221 r223  
    567567        pb_system("ssh -q -p $port $mac \"rm -rf $tdir $bdir\"","VM cleanup on $mac");
    568568        if (! $vmexist) {
    569             pb_system("ssh -q -p $port $mac \"sudo /usr/bin/poweroff \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $vm halt (pid $vmpid)");
     569            pb_system("ssh -q -p $port $mac \"sudo /sbin/halt -p \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $vm halt (pid $vmpid)");
    570570        }
    571571        pb_send2ssh("Packages","$odir"."_"."$over");
     
    636636        $vmm = "$vmpath->{$ENV{'PBPROJ'}}/$vm.qemu";
    637637        if (! -f "$vmm") {
    638             print "Unable to find VM $vmm";
    639             return;
     638            die "Unable to find VM $vmm";
    640639        }
    641640        $cmd = "$vmcmd $ENV{'PBVMOPT'} -redir tcp:$vmport->{$ENV{'PBPROJ'}}:10.0.2.15:22 $vmm"
     
    674673    print SCRIPT "mv .pbrc \$HOME\n";
    675674    print SCRIPT "cd ..\n";
     675    # Force new date to be i nthe future compared to the date of the tar file
     676    my @date=(localtime->sec(), localtime->min(), localtime->hour(), localtime->mday(), localtime->mon(), localtime->year(), localtime->wday(), localtime->yday(), localtime->isdst());
    676677    my $upddate = strftime("%m%d%H%M%Y", @date);
    677678    print SCRIPT "echo Setting up date on $vmntp...\n";
  • 0.8.5/pbconf/project-builder/pbfilter/suse.pbf

    r222 r223  
    44# Filter for suse build
    55#
    6 
    76# PBGRP is replaced by the RPM group of apps
    87filter PBGRP = Applications/Archiving
Note: See TracChangeset for help on using the changeset viewer.