Changeset 2621 in /cluster/svnroot


Ignore:
Timestamp:
Sep 10, 2010 4:47:21 PM (10 years ago)
Author:
fitz
Message:

Fixing bad merge of my build_livecd.pl

File:
1 edited

Legend:

Unmodified
Added
Removed
  • bccd-ng/branches/fitz-devel/bin/build_livecd.pl

    r2619 r2621  
    631631    );
    632632
    633 <<<<<<< .working
    634 =======
    635 if( ! -f "$BUILDDIR/usr/bin/python2" ) {
    636     $Bccd->run_test(
    637         "system",
    638         "",
    639         "Linked python->python2 for C3 tools.",
    640         "/usr/sbin/chroot $BUILDDIR ln -s /usr/bin/python2.5 /usr/bin/python2",
    641         );
    642 }
    643 
    644 >>>>>>> .merge-right.r2618
    645633$Bccd->run_test(
    646634    "system",
     
    740728}
    741729
    742 <<<<<<< .working
    743 # pbs init script needs to happen after bccd-networking (42)
    744 =======
    745730# Based on virtualbox install script
    746731foreach my $script ("vboxadd","vboxadd-x11",) {
     
    753738}
    754739
    755 >>>>>>> .merge-right.r2618
    756740$Bccd->run_test(
    757741    "system",
Note: See TracChangeset for help on using the changeset viewer.