Changeset 1702


Ignore:
Timestamp:
Feb 28, 2013, 4:35:24 PM (5 years ago)
Author:
bruno
Message:
  • Fix #116 by documenting the cachedir parameter
  • remove mkbmpath variable to use cachedir instead (more coherent)
Location:
devel
Files:
4 edited

Legend:

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

    r1701 r1702  
    395395# Where to store packages downloaded temporarily by rpmbootstrap
    396396cachedir rpmbootstrap = /var/cache/rpmbootstrap
    397 cachedir pbmkbm = /var/cache/rpmbootstrap
     397cachedir pbmkbm = /var/cache/pbmkbm
    398398
    399399# Options to pass to rpmbootstrap command. By default keep downloaded packages
     
    432432# pbmkbm configuration parameters
    433433#
    434 mkbmpath default = /var/cache/pbmkbm
    435434vetype pbmkbm = chroot
    436435verpmtype pbmkbm = rpmbootstrap
     
    545544osperldep opensuse = Module-Build,File-MimeInfo,File-BaseDir
    546545ospkgdep opensuse = wget,make,ntp,patch,perl-Date-Manip,perl-File-HomeDir,diffutils
     546ospkgdep opensuse-11.0 = wget,make,ntp,patch,perl-DateManip,perl-File-HomeDir,diffutils
    547547# Mdv
    548548osperldep mandrake-10.1 = Date-Manip
  • devel/pb-modules/etc/pb.conf.pod

    r1606 r1702  
    2626
    2727 Nature: Optional
    28 Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
     28 Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
    2929 Value: comma separated list of URLs that point to repository files, or packages to install. The values may not include substitutions.
    3030 Conffile: project
    3131 Example: addrepo centos-5-x86_64 = file:///prj/extras.repo,http://mirror.centos.org/centos/5.8/extras/x86_64/RPMS/chrpath-0.13-3.el5.centos.x86_64.rpm
     32
     33=item B<cachedir>
     34
     35 Nature: Optional
     36 Key: pb project: rpmbootstrap|pbmkbm|pb
     37 Value: Directory to cache temporary content for the relevant pb project.
     38 Conffile: pb
     39 Example: cachedir rpbootstrap = /var/cache/rpmbootstrap
    3240
    3341=item B<checkexclude>
     
    138146
    139147 Nature: Mandatory
    140  Key: project (as defined in the -p option or PBPROJ environment variable)
     148 Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
    141149 Value: internal (the application then handles the logging of what it finds useful) or the name of an application to launch to log context (e.g. sos, cfg2html, ...).
    142150 Conffile: pb
    143  Example: logcmd pbmkbm = sos
     151 Example: logcmd mageia = sos
    144152
    145153=item B<logcmds>
    146154
    147155 Nature: Optional
    148  Key: project (as defined in the -p option or PBPROJ environment variable)
     156 Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
    149157 Value: In case the B<logcmd> command is internal, a comma separated list of the commands whose trace execution is to be captured in order to log context.
    150158 Conffile: pb
    151  Example: logcmds pbmkbm = mount,lsmod,esxcfg-module -l,df -T
     159 Example: logcmds mageia = mount,lsmod,esxcfg-module -l,df -T
    152160
    153161=item B<logfiles>
    154162
    155163 Nature: Optional
    156  Key: project (as defined in the -p option or PBPROJ environment variable)
     164 Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
    157165 Value: In case the B<logcmd> command is internal, a comma separated list of the files to capture in order to log context.
    158166 Conffile: pb
    159  Example: logfiles pbmkbm = /etc/raidtab,/proc/cmdline,/proc/swaps
     167 Example: logfiles mageia = /etc/raidtab,/proc/cmdline,/proc/swaps
    160168
    161169=item B<logopt>
    162170
    163171 Nature: Optional
    164  Key: project (as defined in the -p option or PBPROJ environment variable)
     172 Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
    165173 Value: In case the B<logcmd> command is not internal, the options of the B<logcmd> application to launch to log context
    166174 Conffile: pb
    167  Example: logcmd pbmkbm = --all
     175 Example: logcmd mageia = --all
    168176
    169177=item B<mkbmbootcmds>
     
    214222 Conffile: pb
    215223 Example: mkbmkerneldir linux = ^linu|^vmlinu|^xen
    216 
    217 =item B<mkbmpath>
    218 
    219  Nature: Mandatory
    220  Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
    221  Value: path of the temporary directory into which the boot media is created.
    222  Conffile: pb
    223  Example: mkbmpath default = /var/cache/pbmkbm
    224224
    225225=item B<mkbmtargetdirs>
  • devel/pb/bin/pb

    r1692 r1702  
    26232623            }
    26242624            # Always redirect the network and always try to use a 'pb' snapshot
    2625             #$cmd = "$vmcmd $ENV{'PBVMOPT'} -net user,hostfwd=tcp:$nport:10.0.2.15:22 -loadvm pb $vmm"
     2625            #$cmd = "$vmcmd $ENV{'PBVMOPT'} -net nic,model=virtio -net user,hostfwd=tcp::$nport-:22 -loadvm pb $vmm"
    26262626            $cmd = "$vmcmd $ENV{'PBVMOPT'} -redir tcp:$nport:10.0.2.15:22 $vmm"
    26272627        } elsif ($vmtype eq "xen") {
  • devel/pbmkbm/bin/pbmkbm

    r1673 r1702  
    283283if (not defined $mkbm{'targetdir'}) {
    284284    $mkbm{'targetdir'} = "/var/cache/pbmkbm";
    285     my ($vestdpath) = pb_conf_get("mkbmpath");
    286     $mkbm{'targetdir'} = "$vestdpath->{'default'}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}" if (defined $vestdpath->{'default'});
     285    my ($vestdpath) = pb_conf_get_if("cachedir");
     286    $mkbm{'targetdir'} = "$vestdpath->{'default'}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}" if ((defined $vestdpath) && (defined $vestdpath->{'default'}));
     287    $mkbm{'targetdir'} = "$vestdpath->{'pbmkbm'}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}" if ((defined $vestdpath) && (defined $vestdpath->{'pbmkbm'}));
    287288    pb_log(1,"No target-dir specified, using $mkbm{'targetdir'}\n");
    288289}
Note: See TracChangeset for help on using the changeset viewer.