Changeset 1716


Ignore:
Timestamp:
Mar 12, 2013, 5:24:42 AM (5 years ago)
Author:
bruno
Message:
  • Fix an error in VMbuild where ' were misplaced leading to the script being printed and not executed
  • Document ossudoersmode for pb.conf
Location:
devel
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/etc/pb.conf

    r1715 r1716  
    251251osins opensuse = sudo /usr/bin/zypper --gpg-auto-import-keys -n install --auto-agree-with-licenses
    252252osins redhat = sudo /bin/rpm -i --ignorearch
    253 osins sol = sudo pkgadd -d
     253osins sol = sudo /usr/sbin/pkgadd -d
    254254osins lsb = /bin/true
    255255
  • devel/pb-modules/etc/pb.conf.pod

    r1714 r1716  
    424424 Example: ossha fedora-10 = sha1
    425425
     426=item B<ossudoersmode>
     427
     428 Nature: Mandatory
     429 Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch).
     430 Value: suffix that will be used in the name of the packages created. By default, concatenation of OS name and version.
     431 Conffile: pb
     432 Example: ossudoersmode novell = 640
     433
    426434=item B<ossuffix>
    427435
  • devel/pb/bin/pb

    r1715 r1716  
    28322832
    28332833    print SCRIPT "echo ... Execution needed\n";
    2834     print SCRIPT "echo '==== Start of script $$ for $vtype $v =====\n";
     2834    print SCRIPT "echo ==== Start of script $$ for $vtype $v =====\n";
    28352835    print SCRIPT "# This is in directory delivery\n";
    28362836    print SCRIPT "# Setup the variables required for building\n";
     
    28562856    print SCRIPT "echo setting up date with $ntpline\n";
    28572857    print SCRIPT "$ntpline\n";
    2858     print SCRIPT 'if [ $? -ne 0 ]; then\n';
     2858    print SCRIPT "if [ \$\? -ne 0 ]; then\n";
    28592859    # Force if bad status a trick using date
    28602860    $ntpline = pb_date2v($vtype,$pbos, 1);
     
    29122912    }
    29132913
    2914     print SCRIPT "echo '==== End of script $$ for $vtype $v =====\n";
     2914    print SCRIPT "echo ==== End of script $$ for $vtype $v =====\n";
    29152915    close(SCRIPT);
    29162916    chmod 0755,"$ENV{'PBDESTDIR'}/pbscript.$$";
Note: See TracChangeset for help on using the changeset viewer.