1 diff -urN util-vserver-0.30.212.org/distrib/Makefile.am util-vserver-0.30.212/distrib/Makefile.am
2 --- util-vserver-0.30.212.org/distrib/Makefile.am 2006-12-09 17:15:33.000000000 +0100
3 +++ util-vserver-0.30.212/distrib/Makefile.am 2007-02-04 18:22:46.969264000 +0100
5 centos4/pkgs/01 centos4/pkgs/02 centos4/pkgs/03 \
6 centos4/yum/yum.conf $(wildcard centos4/yum.repos.d/*.repo) \
7 suse91/apt/rpmpriorities suse91/pkgs/01 suse91/pkgs/02 \
9 + suse91/rpm/macros pld-ac/pkgs/01 pld-ac/rpm/macros \
10 + pld-ac/rpmlist.d/00.lst \
11 + pld-th/pkgs/01 pld-th/rpm/macros pld-th/rpmlist.d/00.lst
13 nobase_confdistrib_DATA = rh9/apt/sources.list \
14 fc1/apt/sources.list \
16 fc4/apt/sources.list \
17 fc5/apt/sources.list \
18 fc6/apt/sources.list \
19 - suse91/apt/sources.list
20 + suse91/apt/sources.list \
21 + pld-ac/poldek/aliases.conf \
22 + pld-ac/poldek/fetch.conf \
23 + pld-ac/poldek/pld-source.conf \
24 + pld-ac/poldek/poldek.conf \
25 + pld-ac/poldek/source.conf \
26 + pld-th/poldek/aliases.conf \
27 + pld-th/poldek/fetch.conf \
28 + pld-th/poldek/pld-source.conf \
29 + pld-th/poldek/poldek.conf \
30 + pld-th/poldek/source.conf
33 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT \
34 = $(nobase_distrib_SCRIPTS)
36 ln -sf ../redhat/initpost $(DESTDIR)$(distribdir)/$$i/ && \
37 ln -sf ../redhat/initpre $(DESTDIR)$(distribdir)/$$i/; \
39 + POLDEKARCH=$(shell rpm -E '%{_target_cpu}' 2>/dev/null); \
40 + if [ -z "$$POLDEKARCH" ] ; then POLDEKARCH=$(shell uname -m) ; fi ; \
41 + sed "s|%ARCH%|$$POLDEKARCH|g" $(DESTDIR)$(confdistribdir)/pld-ac/poldek/pld-source.conf > $(DESTDIR)$(confdistribdir)/pld-ac/poldek/pld-source.conf.tmp ; \
42 + mv $(DESTDIR)$(confdistribdir)/pld-ac/poldek/pld-source.conf.tmp $(DESTDIR)$(confdistribdir)/pld-ac/poldek/pld-source.conf ; \
43 + sed "s|%ARCH%|$$POLDEKARCH|g" $(DESTDIR)$(confdistribdir)/pld-ac/poldek/pld-source.conf > $(DESTDIR)$(confdistribdir)/pld-ac/poldek/pld-source.conf.tmp ; \
44 + mv $(DESTDIR)$(confdistribdir)/pld-ac/poldek/pld-source.conf.tmp $(DESTDIR)$(confdistribdir)/pld-ac/poldek/pld-source.conf
45 $(mkinstalldirs) $(DESTDIR)$(confdir) \
46 $(DESTDIR)$(confdistribdir)/.common/pubkeys \
47 $(DESTDIR)$(confdefaultsdir) \
48 diff -urN util-vserver-0.30.212.org/distrib/pld-ac/pkgs/01 util-vserver-0.30.212/distrib/pld-ac/pkgs/01
49 --- util-vserver-0.30.212.org/distrib/pld-ac/pkgs/01 1970-01-01 01:00:00.000000000 +0100
50 +++ util-vserver-0.30.212/distrib/pld-ac/pkgs/01 2007-02-04 18:20:38.633243500 +0100
57 diff -urN util-vserver-0.30.212.org/distrib/pld-ac/poldek/aliases.conf util-vserver-0.30.212/distrib/pld-ac/poldek/aliases.conf
58 --- util-vserver-0.30.212.org/distrib/pld-ac/poldek/aliases.conf 1970-01-01 01:00:00.000000000 +0100
59 +++ util-vserver-0.30.212/distrib/pld-ac/poldek/aliases.conf 2007-02-04 18:20:38.637243750 +0100
61 +# System wide aliases
69 +freshen = install -FN
72 +# for backward compatybility, greedy is on by default now
73 +greedy-upgrade = install -FG
75 +just-install = install -IN
78 +what-requires = search -r
79 +what-provides = search -p
80 +rsearch = search --perlre
85 +#ls = uninstall kernel
91 diff -urN util-vserver-0.30.212.org/distrib/pld-ac/poldek/fetch.conf util-vserver-0.30.212/distrib/pld-ac/poldek/fetch.conf
92 --- util-vserver-0.30.212.org/distrib/pld-ac/poldek/fetch.conf 1970-01-01 01:00:00.000000000 +0100
93 +++ util-vserver-0.30.212/distrib/pld-ac/poldek/fetch.conf 2007-02-04 18:20:38.637243750 +0100
95 +# Configuration of poldek external file getters. Each [fetcher] section
96 +# declares one external downloader. The syntax is:
99 +# proto = PROTOCOL[ ,PROTOCOL... ]
100 +# cmd = CMD [OPTION...] DESTINATION-MACRO URL-MACRO
101 +# Possible parameters are:
104 +# Unique name of the fetcher. This is an optional parameter, if not set then
105 +# name is taken from the "cmd" parameter value as "$(basename $cmd)".
108 +# Protocol or protocols supported by fetcher. Name of the protocol can be
109 +# completely arbitrary, i.e. if you can handle protocol "foo" by writing
110 +# a script which takes URLs in form 'foo://'.
113 +# Parameter specifies an external command and its invoking syntax.
114 +# The syntax of "cmd" is:
115 +# cmd = COMMAND [ OPTION... ] {%d,%D} {%p,%P}[n]
116 +# Where COMMAND is the name or full path of command, OPTION is command specific
117 +# options. Macro '%d' is replaced with cache directory, '%D' is replaced with
118 +# 'cache directory/file basename', and '%p' with file basename, %P with file full
119 +# path (URL). Optional suffix 'n' with %p and %P means that command can be
120 +# invoked with multiple files at once.
121 +#cmd = foogetter.sh -N %D %Pn
123 +##Configured fetchers
126 +cmd = vfjuggle %d %Pn
129 +proto = http,ftp,https
130 +cmd = wget -N --dot-style=binary -P %d %Pn
142 +cmd = rsync -v %P %d
146 +cmd = vfsmb -v %P %d
150 +#cmd = vfssh.sh %d %Pn
154 +#cmd = foo.sh %d %Pn
157 diff -urN util-vserver-0.30.212.org/distrib/pld-ac/poldek/pld-source.conf util-vserver-0.30.212/distrib/pld-ac/poldek/pld-source.conf
158 --- util-vserver-0.30.212.org/distrib/pld-ac/poldek/pld-source.conf 1970-01-01 01:00:00.000000000 +0100
159 +++ util-vserver-0.30.212/distrib/pld-ac/poldek/pld-source.conf 2007-02-04 18:20:38.637243750 +0100
162 +# PLD <http://www.pld-linux.org/>
165 +_pld_prefix = ftp://ftp.ac.pld-linux.org/dists/ac
167 +## You can use them if you have better connection there
169 +#_pld_prefix = ftp://ftp.task.pld-linux.org/dists/ac
176 +type = %{_ac_idxtype}
178 +path = %{_pld_prefix}/PLD/%{_pld_arch}/PLD/RPMS/
181 +type = %{_ac_idxtype}
182 +name = ac-updates-security
183 +path = %{_pld_prefix}/updates/security/%{_pld_arch}/
186 +type = %{_ac_idxtype}
187 +name = ac-updates-general
188 +path = %{_pld_prefix}/updates/general/%{_pld_arch}/
192 +type = %{_ac_idxtype}
194 +path = %{_pld_prefix}/supported/%{_pld_arch}/
198 +type = %{_ac_idxtype}
200 +path = %{_pld_prefix}/ready/%{_pld_arch}/
204 +type = %{_ac_idxtype}
206 +path = %{_pld_prefix}/test/%{_pld_arch}/
208 diff -urN util-vserver-0.30.212.org/distrib/pld-ac/poldek/poldek.conf util-vserver-0.30.212/distrib/pld-ac/poldek/poldek.conf
209 --- util-vserver-0.30.212.org/distrib/pld-ac/poldek/poldek.conf 1970-01-01 01:00:00.000000000 +0100
210 +++ util-vserver-0.30.212/distrib/pld-ac/poldek/poldek.conf 2007-02-04 18:20:38.637243750 +0100
212 +# poldek main configuration file.
214 +# Some macros. Macros are local, they are not visible in included files
215 +# and macros declared in them are not visible to includer.
216 +# Macros names starts with underscore '_'.
220 +# Both local and remote files may be included. Included files may not contain
221 +# [global] section, it will be ignored anyway.
222 +%include %{_distro}-source.conf
225 +%include source.conf
227 +# External downloaders configuration, not necessary in most cases, cause
228 +# to internal HTTP and FTP client.
229 +#%include fetch.conf
234 +# This parameter allows to configure the default repository index type.
235 +#default index type = pndir
237 +# Cache directory for downloaded files. NOTE: that parent directory of cachedir
239 +#cachedir = $HOME/.poldek-cache
241 +# Switch to ordinary user at startup when executed by root
244 +# Permits using root privileges for installation only. Automatically turned
245 +# on when poldek executed as ordinary user.
248 +# Load /etc/apt/sources.list.
249 +#load apt sources list = no
251 +# Handle gzipped indexes externally (needed on RedHat 9 and Fedora Core 1 and 2).
252 +# This option is a workaround for broken zlib linked into librpm; with enabled
253 +# 'auto zlib in rpm' poldek tries to detect such case and then enables external
254 +# *.gz handling automatically.
255 +#vfile external compress = no
257 +# Auto detection of zlib linked into librpm. See 'vfile external compress'
259 +#auto zlib in rpm = yes
261 +# Automatically download whole index if incremental update fails.
264 +# Do not save given paths into created indexes. This option may significantly
265 +# reduce index size. Example (notice missing starting '/'):
266 +# exclude path = usr/share/doc:usr/share/man:usr/src
269 +# Full path name to a PM (rpm for now) binary.
270 +#pm command = /bin/rpm
272 +# Full path name to sudo binary.
273 +#sudo command = /usr/bin/sudo
276 +### File downloaders configuration
278 +# Send ${USER}@${HOSTNAME} as anonymous FTP password (by default
279 +# 'poldek@znienacka.net' is sent)
280 +#vfile ftp sysuser as anon passwd = no
282 +# File getters configuration parameter. By this option URL handlers may be configured.
283 +# To get file from HTTP and FTP servers poldek uses its internal client (what is
284 +# recommended), although it can be changedby this option. Others protocols handled
285 +# by external utilities can be configured also. The syntax is:
286 +# default fetcher = PROTOCOL[,PROTOCOL...]:FETCHER_NAME
288 +# where FETCHER_NAME is a name of one of the fetcher preconfigured in [fetch]
289 +# sections (placed in fetch.conf in default configuration).
291 +# default fetcher = ftp,http:internal
292 +# default fetcher = https:wget
293 +# default fetcher = cdrom:vfjuggle
294 +# vfjuggle is a cdrom getter supplied with poldek.
295 +#default fetcher = http,ftp: internal
297 +# Proxies for internal FTP and HTTP client may be configured in usual
298 +# way, by environment variables ftp_proxy and http_proxy, or by this option.
299 +# Its syntax is similar to "default fetcher" one:
300 +# proxy = PROTOCOL[,PROTOCOL...]:PROXY_URL
302 +# proxy = http: http://w3cache.foo.org:8080
305 +# Comma separated list of hosts or domains which will not be accessed via proxy.
306 +# Option overrides no_proxy environment variable.
308 +# noproxy = localhost, .pl, ftp.foo.bar.org
311 +# Internal HTTP and FTP client is stubborn, it retries to retrive
312 +# file if connection breaks. This option tells it how many times
314 +#vfile retries = 128
317 +### Installation options
319 +# Install packages in small groups instead of doing all-or-nothing
321 +particle install = no
323 +# Do not remove downloaded packages after its successful installation.
324 +#keep downloads = no
326 +# Controls visibility of multiple package instances with different EVR.
327 +# If on, only one, highest version will be visible.
328 +#unique package names = no
330 +# Epoch autopromotion during dependency comparision. RPM specific.
331 +# Set it up if you are using system with rpm prior to 4.2.1 version.
334 +# Confirm packages installation.
335 +#confirm installation = no
337 +# Confirm packages removal.
338 +#confirm removal = yes
340 +# Let the user select package among equivalents.
341 +choose equivalents manually = yes
343 +# Prevent package listed from being upgraded if they are already installed.
344 +# hold = kernel* dev
347 +# Ignore package list - packages fits given mask will be invisible.
348 +# ignore = *-smp-* foo*
349 +ignore = kernel* udev devfs
351 +# Conflicts with already installed packages are treated as resolved
352 +# if at least one of multiple-installed package satisfies conflict.
353 +# rpm doesn't support such cases, so --pm-nodeps is needed (use with
355 +#allow duplicates = yes
358 +### RPM specific options
360 +# rpm macros can be set by this option. Examples:
361 +# rpmdef = _install_langs pl:pl_PL:lt:lt_LT
362 +# Do not install any documentation:
363 +# rpmdef = _netsharedpath /usr/share/info:/usr/share/man
364 +# rpmdef = _excludedocs 1
368 +### Dependency processing settings
369 +# Subtle dependency processing options, they should not be changed
370 +# unless you know what you are doing
372 +# Automatically install packages required by installed ones.
375 +# Greedy upgrades, i.e. upgrade packages which dependencies are broken
376 +# by being uninstalled ones.
379 +# Be yet more greedy; if successor of orphaned package found, and this
380 +# successor drags no packages then upgrade the package instead of process
381 +# its dependencies. Option value is implied by 'greedy' one by defalut.
382 +#aggressive greedy = yes
384 +# Be tolerant for unmatched versioned dependencies which rpm tolerates, e.g.
385 +# package A requires capability foo >= 1.0 while package B provides "foo"
386 +# without any version. Use with care, it may cause weird dependency errors.
389 +# Taking into account package Obsoletes.
392 +# Taking into account package Conflicts.
394 diff -urN util-vserver-0.30.212.org/distrib/pld-ac/poldek/source.conf util-vserver-0.30.212/distrib/pld-ac/poldek/source.conf
395 --- util-vserver-0.30.212.org/distrib/pld-ac/poldek/source.conf 1970-01-01 01:00:00.000000000 +0100
396 +++ util-vserver-0.30.212/distrib/pld-ac/poldek/source.conf 2007-02-04 18:20:38.637243750 +0100
398 +# Sample poldek sources configuration
399 +# Every source is configured in his own [source] section.
400 +# Possible parameters are:
403 +# Unique name of the repository.
406 +# Type of repository index. Permitted values are 'pndir', 'pdir', 'apt', 'yum'
407 +# and 'dir' as listed by --stl switch.
410 +# This parameter sets index original type i.e type of repository
411 +# from what this repository is created. Default is 'dir' - means
412 +# that directory of packages is scanned.
413 +#original type = dir
415 +# Unique name of the repository. May be either path or URL.
416 +#path = /some/url/or/dir
418 +# If package index and packages are stored in different locations then
419 +# prefix stands for packages path.
420 +#prefix = /some/url/or/dir
422 +# Controls visibility of multiple package instances with different EVR.
423 +# If on, only one, highest version will be visible.
426 +# Repository priority. If the same packages (equal names and EVR)
427 +# are available in more than one source then package from highest
428 +# prioritized source are taken. Priority is numeric value. Lower number
429 +# means higher priority, and negative priorities are allowed.
430 +# Priority is numeric value.
433 +# Controling if repository index will be implicit loaded. Set it off if
434 +# the index should be loaded on demand only, i.e. if specified directly
438 +# Controls if repository index will be implicit updated. Set it off if
439 +# the index should be updated on demand only, i.e. if specified directly
443 +# Packages PGP/GPG signatures (if any) will be verified before their
447 +# Have the same meaning as [global] parameter. Example:
448 +# hold = kernel* dev
451 +# Have the same meaning as [global] parameter. Example:
452 +# ignore = kernel*smp* dev
455 +# Parameter have the same meaning as [global] parameter.
456 +# exclude path = usr/share/doc:usr/share/man:usr/src
459 +# Preferred language of package descriptions. If not set, taken from locale
460 +# settings. Example:
461 +# lang = pl_PL:lt_LT
467 +path = $HOME/rpm/RPMS
474 +#path = ftp://ftp.foo.bar.org/RPMS/
480 +#ignore = kernel*-smp-*
483 diff -urN util-vserver-0.30.212.org/distrib/pld-ac/rpm/macros util-vserver-0.30.212/distrib/pld-ac/rpm/macros
484 --- util-vserver-0.30.212.org/distrib/pld-ac/rpm/macros 1970-01-01 01:00:00.000000000 +0100
485 +++ util-vserver-0.30.212/distrib/pld-ac/rpm/macros 2007-02-04 18:20:38.637243750 +0100
487 +# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
488 +# you have to use at least one language beside 'C'
489 +%_install_langs C:en:pl
490 +%_netsharedpath /dev
491 diff -urN util-vserver-0.30.212.org/distrib/pld-ac/rpmlist.d/00.lst util-vserver-0.30.212/distrib/pld-ac/rpmlist.d/00.lst
492 --- util-vserver-0.30.212.org/distrib/pld-ac/rpmlist.d/00.lst 1970-01-01 01:00:00.000000000 +0100
493 +++ util-vserver-0.30.212/distrib/pld-ac/rpmlist.d/00.lst 2007-02-04 18:20:38.637243750 +0100
504 +vserver-packages-*.rpm
505 diff -urN util-vserver-0.30.212.org/distrib/pld-th/pkgs/01 util-vserver-0.30.212/distrib/pld-th/pkgs/01
506 --- util-vserver-0.30.212.org/distrib/pld-th/pkgs/01 1970-01-01 01:00:00.000000000 +0100
507 +++ util-vserver-0.30.212/distrib/pld-th/pkgs/01 2007-02-04 18:20:38.633243000 +0100
514 diff -urN util-vserver-0.30.212.org/distrib/pld-th/poldek/aliases.conf util-vserver-0.30.212/distrib/pld-th/poldek/aliases.conf
515 --- util-vserver-0.30.212.org/distrib/pld-th/poldek/aliases.conf 1970-01-01 01:00:00.000000000 +0100
516 +++ util-vserver-0.30.212/distrib/pld-th/poldek/aliases.conf 2007-02-04 18:20:38.637243000 +0100
518 +# System wide aliases
526 +freshen = install -FN
527 +upgrade = install -F
529 +# for backward compatybility, greedy is on by default now
530 +greedy-upgrade = install -FG
532 +just-install = install -IN
535 +what-requires = search -r
536 +what-provides = search -p
537 +rsearch = search --perlre
542 +#ls = uninstall kernel
548 diff -urN util-vserver-0.30.212.org/distrib/pld-th/poldek/fetch.conf util-vserver-0.30.212/distrib/pld-th/poldek/fetch.conf
549 --- util-vserver-0.30.212.org/distrib/pld-th/poldek/fetch.conf 1970-01-01 01:00:00.000000000 +0100
550 +++ util-vserver-0.30.212/distrib/pld-th/poldek/fetch.conf 2007-02-04 18:20:38.637243000 +0100
552 +# Configuration of poldek external file getters. Each [fetcher] section
553 +# declares one external downloader. The syntax is:
556 +# proto = PROTOCOL[ ,PROTOCOL... ]
557 +# cmd = CMD [OPTION...] DESTINATION-MACRO URL-MACRO
558 +# Possible parameters are:
561 +# Unique name of the fetcher. This is an optional parameter, if not set then
562 +# name is taken from the "cmd" parameter value as "$(basename $cmd)".
565 +# Protocol or protocols supported by fetcher. Name of the protocol can be
566 +# completely arbitrary, i.e. if you can handle protocol "foo" by writing
567 +# a script which takes URLs in form 'foo://'.
570 +# Parameter specifies an external command and its invoking syntax.
571 +# The syntax of "cmd" is:
572 +# cmd = COMMAND [ OPTION... ] {%d,%D} {%p,%P}[n]
573 +# Where COMMAND is the name or full path of command, OPTION is command specific
574 +# options. Macro '%d' is replaced with cache directory, '%D' is replaced with
575 +# 'cache directory/file basename', and '%p' with file basename, %P with file full
576 +# path (URL). Optional suffix 'n' with %p and %P means that command can be
577 +# invoked with multiple files at once.
578 +#cmd = foogetter.sh -N %D %Pn
580 +##Configured fetchers
583 +cmd = vfjuggle %d %Pn
586 +proto = http,ftp,https
587 +cmd = wget -N --dot-style=binary -P %d %Pn
599 +cmd = rsync -v %P %d
603 +cmd = vfsmb -v %P %d
607 +#cmd = vfssh.sh %d %Pn
611 +#cmd = foo.sh %d %Pn
614 diff -urN util-vserver-0.30.212.org/distrib/pld-th/poldek/pld-source.conf util-vserver-0.30.212/distrib/pld-th/poldek/pld-source.conf
615 --- util-vserver-0.30.212.org/distrib/pld-th/poldek/pld-source.conf 1970-01-01 01:00:00.000000000 +0100
616 +++ util-vserver-0.30.212/distrib/pld-th/poldek/pld-source.conf 2007-02-04 18:25:33.175651250 +0100
618 +# PLD <http://www.pld-linux.org/>
621 +_pld_prefix = ftp://ftp.th.pld-linux.org/dists/th
623 +## You can use them if you have better connection there
625 +#_pld_prefix = ftp://ftp.task.pld-linux.org/dists/th
632 +type = %{_th_idxtype}
634 +path = %{_pld_prefix}/PLD/%{_pld_arch}/RPMS/
637 +type = %{_th_idxtype}
639 +path = %{_pld_prefix}/PLD/noarch/RPMS/
642 +type = %{_th_idxtype}
643 +name = th-updates-security
644 +path = %{_pld_prefix}/updates-security/%{_pld_arch}/RPMS/
647 +type = %{_th_idxtype}
648 +name = th-updates-general
649 +path = %{_pld_prefix}/updates-general/%{_pld_arch}/RPMS/
653 +#type = %{_th_idxtype}
654 +#name = th-supported
655 +#path = %{_pld_prefix}/supported/%{_pld_arch}/RPMS/
659 +type = %{_th_idxtype}
661 +path = %{_pld_prefix}/ready/%{_pld_arch}/RPMS/
665 +type = %{_th_idxtype}
667 +path = %{_pld_prefix}/test/%{_pld_arch}/RPMS/
669 diff -urN util-vserver-0.30.212.org/distrib/pld-th/poldek/poldek.conf util-vserver-0.30.212/distrib/pld-th/poldek/poldek.conf
670 --- util-vserver-0.30.212.org/distrib/pld-th/poldek/poldek.conf 1970-01-01 01:00:00.000000000 +0100
671 +++ util-vserver-0.30.212/distrib/pld-th/poldek/poldek.conf 2007-02-04 18:20:38.637243000 +0100
673 +# poldek main configuration file.
675 +# Some macros. Macros are local, they are not visible in included files
676 +# and macros declared in them are not visible to includer.
677 +# Macros names starts with underscore '_'.
681 +# Both local and remote files may be included. Included files may not contain
682 +# [global] section, it will be ignored anyway.
683 +%include %{_distro}-source.conf
686 +%include source.conf
688 +# External downloaders configuration, not necessary in most cases, cause
689 +# to internal HTTP and FTP client.
690 +#%include fetch.conf
695 +# This parameter allows to configure the default repository index type.
696 +#default index type = pndir
698 +# Cache directory for downloaded files. NOTE: that parent directory of cachedir
700 +#cachedir = $HOME/.poldek-cache
702 +# Switch to ordinary user at startup when executed by root
705 +# Permits using root privileges for installation only. Automatically turned
706 +# on when poldek executed as ordinary user.
709 +# Load /etc/apt/sources.list.
710 +#load apt sources list = no
712 +# Handle gzipped indexes externally (needed on RedHat 9 and Fedora Core 1 and 2).
713 +# This option is a workaround for broken zlib linked into librpm; with enabled
714 +# 'auto zlib in rpm' poldek tries to detect such case and then enables external
715 +# *.gz handling automatically.
716 +#vfile external compress = no
718 +# Auto detection of zlib linked into librpm. See 'vfile external compress'
720 +#auto zlib in rpm = yes
722 +# Automatically download whole index if incremental update fails.
725 +# Do not save given paths into created indexes. This option may significantly
726 +# reduce index size. Example (notice missing starting '/'):
727 +# exclude path = usr/share/doc:usr/share/man:usr/src
730 +# Full path name to a PM (rpm for now) binary.
731 +#pm command = /bin/rpm
733 +# Full path name to sudo binary.
734 +#sudo command = /usr/bin/sudo
737 +### File downloaders configuration
739 +# Send ${USER}@${HOSTNAME} as anonymous FTP password (by default
740 +# 'poldek@znienacka.net' is sent)
741 +#vfile ftp sysuser as anon passwd = no
743 +# File getters configuration parameter. By this option URL handlers may be configured.
744 +# To get file from HTTP and FTP servers poldek uses its internal client (what is
745 +# recommended), although it can be changedby this option. Others protocols handled
746 +# by external utilities can be configured also. The syntax is:
747 +# default fetcher = PROTOCOL[,PROTOCOL...]:FETCHER_NAME
749 +# where FETCHER_NAME is a name of one of the fetcher preconfigured in [fetch]
750 +# sections (placed in fetch.conf in default configuration).
752 +# default fetcher = ftp,http:internal
753 +# default fetcher = https:wget
754 +# default fetcher = cdrom:vfjuggle
755 +# vfjuggle is a cdrom getter supplied with poldek.
756 +#default fetcher = http,ftp: internal
758 +# Proxies for internal FTP and HTTP client may be configured in usual
759 +# way, by environment variables ftp_proxy and http_proxy, or by this option.
760 +# Its syntax is similar to "default fetcher" one:
761 +# proxy = PROTOCOL[,PROTOCOL...]:PROXY_URL
763 +# proxy = http: http://w3cache.foo.org:8080
766 +# Comma separated list of hosts or domains which will not be accessed via proxy.
767 +# Option overrides no_proxy environment variable.
769 +# noproxy = localhost, .pl, ftp.foo.bar.org
772 +# Internal HTTP and FTP client is stubborn, it retries to retrive
773 +# file if connection breaks. This option tells it how many times
775 +#vfile retries = 128
778 +### Installation options
780 +# Install packages in small groups instead of doing all-or-nothing
782 +particle install = no
784 +# Do not remove downloaded packages after its successful installation.
785 +#keep downloads = no
787 +# Controls visibility of multiple package instances with different EVR.
788 +# If on, only one, highest version will be visible.
789 +#unique package names = no
791 +# Epoch autopromotion during dependency comparision. RPM specific.
792 +# Set it up if you are using system with rpm prior to 4.2.1 version.
795 +# Confirm packages installation.
796 +#confirm installation = no
798 +# Confirm packages removal.
799 +#confirm removal = yes
801 +# Let the user select package among equivalents.
802 +choose equivalents manually = yes
804 +# Prevent package listed from being upgraded if they are already installed.
805 +# hold = kernel* dev
808 +# Ignore package list - packages fits given mask will be invisible.
809 +# ignore = *-smp-* foo*
810 +ignore = kernel* udev devfs
812 +# Conflicts with already installed packages are treated as resolved
813 +# if at least one of multiple-installed package satisfies conflict.
814 +# rpm doesn't support such cases, so --pm-nodeps is needed (use with
816 +#allow duplicates = yes
819 +### RPM specific options
821 +# rpm macros can be set by this option. Examples:
822 +# rpmdef = _install_langs pl:pl_PL:lt:lt_LT
823 +# Do not install any documentation:
824 +# rpmdef = _netsharedpath /usr/share/info:/usr/share/man
825 +# rpmdef = _excludedocs 1
829 +### Dependency processing settings
830 +# Subtle dependency processing options, they should not be changed
831 +# unless you know what you are doing
833 +# Automatically install packages required by installed ones.
836 +# Greedy upgrades, i.e. upgrade packages which dependencies are broken
837 +# by being uninstalled ones.
840 +# Be yet more greedy; if successor of orphaned package found, and this
841 +# successor drags no packages then upgrade the package instead of process
842 +# its dependencies. Option value is implied by 'greedy' one by defalut.
843 +#aggressive greedy = yes
845 +# Be tolerant for unmatched versioned dependencies which rpm tolerates, e.g.
846 +# package A requires capability foo >= 1.0 while package B provides "foo"
847 +# without any version. Use with care, it may cause weird dependency errors.
850 +# Taking into account package Obsoletes.
853 +# Taking into account package Conflicts.
855 diff -urN util-vserver-0.30.212.org/distrib/pld-th/poldek/source.conf util-vserver-0.30.212/distrib/pld-th/poldek/source.conf
856 --- util-vserver-0.30.212.org/distrib/pld-th/poldek/source.conf 1970-01-01 01:00:00.000000000 +0100
857 +++ util-vserver-0.30.212/distrib/pld-th/poldek/source.conf 2007-02-04 18:20:38.637243000 +0100
859 +# Sample poldek sources configuration
860 +# Every source is configured in his own [source] section.
861 +# Possible parameters are:
864 +# Unique name of the repository.
867 +# Type of repository index. Permitted values are 'pndir', 'pdir', 'apt', 'yum'
868 +# and 'dir' as listed by --stl switch.
871 +# This parameter sets index original type i.e type of repository
872 +# from what this repository is created. Default is 'dir' - means
873 +# that directory of packages is scanned.
874 +#original type = dir
876 +# Unique name of the repository. May be either path or URL.
877 +#path = /some/url/or/dir
879 +# If package index and packages are stored in different locations then
880 +# prefix stands for packages path.
881 +#prefix = /some/url/or/dir
883 +# Controls visibility of multiple package instances with different EVR.
884 +# If on, only one, highest version will be visible.
887 +# Repository priority. If the same packages (equal names and EVR)
888 +# are available in more than one source then package from highest
889 +# prioritized source are taken. Priority is numeric value. Lower number
890 +# means higher priority, and negative priorities are allowed.
891 +# Priority is numeric value.
894 +# Controling if repository index will be implicit loaded. Set it off if
895 +# the index should be loaded on demand only, i.e. if specified directly
899 +# Controls if repository index will be implicit updated. Set it off if
900 +# the index should be updated on demand only, i.e. if specified directly
904 +# Packages PGP/GPG signatures (if any) will be verified before their
908 +# Have the same meaning as [global] parameter. Example:
909 +# hold = kernel* dev
912 +# Have the same meaning as [global] parameter. Example:
913 +# ignore = kernel*smp* dev
916 +# Parameter have the same meaning as [global] parameter.
917 +# exclude path = usr/share/doc:usr/share/man:usr/src
920 +# Preferred language of package descriptions. If not set, taken from locale
921 +# settings. Example:
922 +# lang = pl_PL:lt_LT
928 +path = $HOME/rpm/RPMS
935 +#path = ftp://ftp.foo.bar.org/RPMS/
941 +#ignore = kernel*-smp-*
944 diff -urN util-vserver-0.30.212.org/distrib/pld-th/rpm/macros util-vserver-0.30.212/distrib/pld-th/rpm/macros
945 --- util-vserver-0.30.212.org/distrib/pld-th/rpm/macros 1970-01-01 01:00:00.000000000 +0100
946 +++ util-vserver-0.30.212/distrib/pld-th/rpm/macros 2007-02-04 18:20:38.637243000 +0100
948 +# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
949 +# you have to use at least one language beside 'C'
950 +%_install_langs C:en:pl
951 +%_netsharedpath /dev
952 diff -urN util-vserver-0.30.212.org/distrib/pld-th/rpmlist.d/00.lst util-vserver-0.30.212/distrib/pld-th/rpmlist.d/00.lst
953 --- util-vserver-0.30.212.org/distrib/pld-th/rpmlist.d/00.lst 1970-01-01 01:00:00.000000000 +0100
954 +++ util-vserver-0.30.212/distrib/pld-th/rpmlist.d/00.lst 2007-02-04 18:20:38.637243000 +0100
965 +vserver-packages-*.rpm
966 diff -urN util-vserver-0.30.212.org/scripts/functions util-vserver-0.30.212/scripts/functions
967 --- util-vserver-0.30.212.org/scripts/functions 2006-12-09 17:15:24.000000000 +0100
968 +++ util-vserver-0.30.212/scripts/functions 2007-02-04 18:20:38.637243750 +0100
973 +function _pkgSetVarsPoldek
975 + if test -n "$PKGDIR"; then
976 + findDir POLDEKETCDIR $PKGDIR/poldeketc $PKGDIR/base/poldek/etc /etc/poldek
977 + findDir POLDEKCACHEDIR $PKGDIR/poldek-cache $PKGDIR/base/poldek/cache
979 + findDir POLDEKETCDIR "$VDIR"/etc/poldek /etc/poldek
980 + findDir POLDEKCACHEDIR "$VDIR"/var/tmp/poldek-cache
983 + findFile POLDEK_CONFIG "$POLDEKETCDIR"/poldek.conf ""
984 + test -z "$POLDEK_CONFIG" || export POLDEK_CONFIG
988 function _pkgMountBase
991 rpm) _pkgSetVarsRPM;;
992 apt) _pkgSetVarsApt;;
993 yum) _pkgSetVarsYum;;
994 + poldek) _pkgSetVarsPoldek;;
995 *) echo "Unknown packaging flavor" >&2; exit 1;;
1000 elif test -e "$_pgs_vdir"/etc/mandrake-release; then
1002 + elif test -e "$_pgs_vdir"/etc/pld-release; then
1004 elif test -e "$_pgs_vdir"/etc/debian_version; then
1006 elif test -e "$_pgs_vdir"/etc/SuSE-release; then
1007 @@ -817,6 +834,27 @@
1008 test -n "$have_yum" && return 0 || return 1
1011 +## Usage: pkgmgmt.isPoldekAvailable <cfgdir> <vdir> [<is-internal>]
1012 +function pkgmgmt.isPoldekAvailable
1016 + local is_internal="$3"
1018 + local have_poldek i
1019 + if test -n "$is_internal"; then
1021 + test -d "$cfgdir"/base/poldek -o -d "$cfgdir"/poldeketc || have_poldek=
1024 + for i in /bin /usr/bin /usr/local/bin; do
1025 + test ! -x "$vdir$i"/poldek || { have_poldek=1; break; }
1029 + test -n "$have_poldek" && return 0 || return 1
1033 function vshelper.doSanityCheck
1035 diff -urN util-vserver-0.30.212.org/scripts/Makefile-files util-vserver-0.30.212/scripts/Makefile-files
1036 --- util-vserver-0.30.212.org/scripts/Makefile-files 2006-12-09 17:15:24.000000000 +0100
1037 +++ util-vserver-0.30.212/scripts/Makefile-files 2007-02-04 18:20:38.669245750 +0100
1039 scripts/vapt-get-worker \
1040 scripts/vrpm-worker \
1041 scripts/vyum-worker \
1042 + scripts/vpoldek-worker \
1043 scripts/vrpm-preload \
1044 scripts/save_s_context \
1045 scripts/vservers.grabinfo.sh \
1047 scripts/vserver-build.yum \
1048 scripts/vserver-build.template \
1049 scripts/vserver-build.rsync \
1050 + scripts/vserver-build.poldek \
1051 scripts/vserver-build.functions \
1052 scripts/vserver-build.functions.apt \
1053 scripts/vserver-build.functions.rpm \
1054 scripts/vserver-build.functions.pkgmgmt \
1055 scripts/vserver-build.functions.yum \
1056 + scripts/vserver-build.functions.poldek \
1057 scripts/vserver-setup.functions \
1058 scripts/vserver.functions \
1059 scripts/vserver.start \
1061 scripts_pkglib_src_SCRPTS = scripts/pkgmgmt \
1062 scripts/vapt-get-worker \
1064 + scripts/vpoldek-worker \
1065 scripts/vrpm-worker \
1066 scripts/vrpm-preload \
1067 scripts/start-vservers \
1069 scripts_sbin_src_PRGS = scripts/chbind \
1073 scripts/vdispatch-conf \
1076 diff -urN util-vserver-0.30.212.org/scripts/pkgmgmt util-vserver-0.30.212/scripts/pkgmgmt
1077 --- util-vserver-0.30.212.org/scripts/pkgmgmt 2006-12-09 17:15:24.000000000 +0100
1078 +++ util-vserver-0.30.212/scripts/pkgmgmt 2007-02-04 18:20:38.673246000 +0100
1083 - (RH) pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum "${YUM_RELEASEPKGS[@]}")
1084 + (RH) pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum poldek "${YUM_RELEASEPKGS[@]}")
1085 hasSubstring "$pkgs" ---rpm--- || {
1087 * The vserver does not seem to have the 'rpm' package which is required
1092 - hasSubstring "$pkgs" ---apt--- ---yum--- || {
1093 + hasSubstring "$pkgs" ---apt--- ---yum--- ---poldek--- || {
1095 -* The vserver does not seem to have a depsolver like 'apt' or 'yum'
1096 +* The vserver does not seem to have a depsolver like 'apt', 'yum' or 'poldek'
1097 installed. It is suggested to install such a program before setting
1098 up internal package management."
1100 @@ -368,6 +368,131 @@
1104 +function processVserver_PLD()
1107 + local is_internalize=$2
1111 + cfgdir=$($_VSERVER_INFO "$vserver" APPDIR pkgmgmt) || \
1112 + cfgdir=$($_VSERVER_INFO "$vserver" APPDIR)/pkgmgmt
1114 + ## Figure out the environment....
1115 + pkgmgmt.isPoldekAvailable "$cfgdir" "$vdir" "$is_internalize" || have_poldek=
1117 + local POLDEKETCDIR=
1118 + local POLDEKCACHEDIR=
1120 + local RPMSTATEDIR=
1122 + ## Create directories and assign variables where configuration
1123 + ## can/will be found on the host
1124 + if test -n "$is_internalize"; then
1125 + verifyInternalPackages "$vserver" RH || test -n "$IS_FORCE" ||
1127 +Can not continue; use '--force' to override this check"
1129 + pushd "$vdir" >/dev/null
1131 + test ! -L var/lib/rpm || {
1132 + $_EXEC_CD /var/lib $_RM rpm &&
1133 + $_EXEC_CD /var/lib $_MKDIR -m755 rpm &&
1134 + $_EXEC_CD /var/lib $_CHOWN rpm:rpm rpm ||
1136 + } </dev/null 2>/dev/null
1138 + for i in var/tmp/poldek-cache etc/rpm etc/poldek; do
1140 + $_EXEC_CD /$(dirname "$i") $_MKDIR -m755 $(basename "$i") || :
1145 + if test -n "$have_poldek"; then
1146 + findDir POLDEKETCDIR "$cfgdir"/poldeketc "$cfgdir"/base/poldek/etc /etc/poldek
1149 + findDir RPMETCDIR "$cfgdir"/rpmetc "$cfgdir"/base/rpm/etc /etc/rpm /
1150 + findDir RPMSTATEDIR "$cfgdir"/rpmstate "$cfgdir"/base/rpm/state
1152 + mkdir -m755 -p "$cfgdir"
1155 + if test -n "$have_poldek"; then
1156 + findDir POLDEKETCDIR "$cfgdir"/poldeketc "$cfgdir"/base/poldek/etc /
1157 + findDir POLDEKCACHEDIR "$cfgdir"/poldek-cache "$cfgdir"/base/poldek/cache /
1159 + test "$POLDEKETCDIR" != / || POLDEKETCDIR=$cfgdir/base/poldek/etc
1160 + test "$POLDEKCACHEDIR" != / || POLDEKCACHEDIR=$cfgdir/base/poldek/cache
1162 + test -d "$cfgdir"/poldeketc -a -d "$cfgdir"/poldek-cache || need_base=1
1165 + findDir RPMETCDIR "$cfgdir"/rpmetc "$cfgdir"/base/rpm/etc /
1166 + findDir RPMSTATEDIR "$cfgdir"/rpmstate "$cfgdir"/base/rpm/state /
1168 + test "$RPMETCDIR" != / || RPMETCDIR=$cfgdir/base/rpm/etc
1169 + test "$RPMSTATEDIR" != / || RPMSTATEDIR=$cfgdir/base/rpm/state
1171 + test -d "$cfgdir"/rpmetc -a -d "$cfgdir"/rpmstate || need_base=1
1172 + test ! -e "$cfgdir"/base || need_base=
1174 + test -z "$need_base" || ln -s "$PKGCFGDIR" "$cfgdir"/base
1176 + mkdir -m755 -p "$PKGCFGDIR"
1177 + _createDirs "$POLDEKETCDIR" "$POLDEKCACHEDIR" \
1178 + "$RPMETCDIR" "$RPMSTATEDIR"
1181 + ## Copy the files...
1182 + if test -n "$is_internalize"; then
1183 + if test -n "$have_poldek"; then
1184 + _copySecure "$vdir" "$POLDEKETCDIR" /etc/poldek
1185 + pushd "$vdir" >/dev/null
1186 + _hashAuto /etc/poldek.conf '/'
1190 + _copySecure "$vdir" "$RPMETCDIR" /etc/rpm
1191 + _copySecure "$vdir" "$RPMSTATEDIR" /var/lib/rpm
1193 + pushd "$vdir" >/dev/null
1194 + ## remove %_dbpath settings
1195 + _substFile /etc/rpm/macros '/^%_dbpath[ \t].*/D'
1198 + if test -n "$have_poldek"; then
1199 + _copySecureRev "$vdir" /etc/poldek "$POLDEKETCDIR"
1200 + _unhashAuto "$POLDEKETCDIR"/poldek.conf '/'
1203 + _copySecureRev "$vdir" /etc/rpm "$RPMETCDIR"
1204 + _copySecureRev "$vdir" /var/lib/rpm "$RPMSTATEDIR"
1206 + echo -e "%_dbpath\t\t$rpmdb_mntpoint" >>$RPMETCDIR/macros
1210 + if test -n "$is_internalize"; then
1213 + tmpdir=$($_MKTEMPDIR -p /var/tmp pgmgmt.XXXXXX)
1214 + trap "$_RM -rf $tmpdir" EXIT
1215 + pushd "$vdir" >/dev/null
1216 + $_EXEC_CD /var/lib $_MV rpm $tmpdir/
1217 + $_EXEC_CD /var/lib $_LN_S "$rpmdb_mntpoint" rpm
1222 + if test -n "$is_internalize"; then
1223 + $_TOUCH "$cfgdir"/internal
1225 + $_RM -f "$cfgdir"/internal
1229 function processVserver_Debian()
1235 (redhat|mandrake) processVserver_RH "$vserver" "$IS_INTERNALIZE";;
1236 + (pld) processVserver_PLD "$vserver" "$IS_INTERNALIZE";;
1237 (debian) processVserver_Debian "$vserver" "$IS_INTERNALIZE";;
1239 echo $"Vserver style '$style' is not supported for packagemanagment" >&2
1240 diff -urN util-vserver-0.30.212.org/scripts/util-vserver-vars.pathsubst util-vserver-0.30.212/scripts/util-vserver-vars.pathsubst
1241 --- util-vserver-0.30.212.org/scripts/util-vserver-vars.pathsubst 2006-12-09 17:15:24.000000000 +0100
1242 +++ util-vserver-0.30.212/scripts/util-vserver-vars.pathsubst 2007-02-04 18:20:38.673246000 +0100
1244 _LIB_VSERVER_BUILD_FUNCTIONS_RPM="$__PKGLIBDIR/vserver-build.functions.rpm"
1245 _LIB_VSERVER_BUILD_FUNCTIONS_YUM="$__PKGLIBDIR/vserver-build.functions.yum"
1246 _LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT="$__PKGLIBDIR/vserver-build.functions.pkgmgmt"
1247 +_LIB_VSERVER_BUILD_FUNCTIONS_POLDEK="$__PKGLIBDIR/vserver-build.functions.poldek"
1248 _LISTDEVIP="$__LEGACYDIR/listdevip"
1249 _LOCKFILE="$__PKGLIBDIR/lockfile"
1250 _MASK2PREFIX="$__PKGLIBDIR/mask2prefix"
1252 _VUNIFY="$__PKGLIBDIR/vunify"
1253 _VYUM="$__SBINDIR/vyum"
1254 _VYUM_WORKER="$__PKGLIBDIR/vyum-worker"
1255 +_VPOLDEK="$__SBINDIR/vpoldek"
1256 +_VPOLDEK_WORKER="$__PKGLIBDIR/vpoldek-worker"
1260 diff -urN util-vserver-0.30.212.org/scripts/vpkg util-vserver-0.30.212/scripts/vpkg
1261 --- util-vserver-0.30.212.org/scripts/vpkg 2006-12-09 17:15:24.000000000 +0100
1262 +++ util-vserver-0.30.212/scripts/vpkg 2007-02-04 18:20:38.673246000 +0100
1263 @@ -115,6 +115,44 @@
1271 + ## rpm outputs sometimes '(contains no files)', so return
1272 + ## only the valid output
1274 + rpm_param=( -qac --pipe "$_SED '\!^/!p;d'" );;
1276 + rpm_param=( -Uvh "$@" )
1277 + poldek_param=( --install -v "$@" )
1281 + if test -n "$is_external"; then
1283 + test -d "$cfgdir"/base/poldek -o -d "$cfgdir"/poldeketc || have_poldek=
1286 + for i in /bin /usr/bin /usr/local/bin; do
1287 + test ! -x "$vdir$i"/poldek || { have_poldek=1; break; }
1291 + if test -n "$is_external"; then
1292 + if test "$have_poldek" -a "$poldek_param"; then
1293 + cmd=( "$_VPOLDEK" "$vserver" -- "${poldek_param[@]}" )
1295 + cmd=( "$_VRPM" "$vserver" -- "${rpm_param[@]}" )
1298 + if test "$have_poldek" -a "$poldek_param"; then
1299 + cmd=( "$_VSERVER" --silent "$vserver" exec poldek "${poldek_param[@]}" )
1301 + cmd=( "$_VSERVER" --silent "$vserver" exec rpm "${rpm_param[@]}" )
1308 diff -urN util-vserver-0.30.212.org/scripts/vpoldek util-vserver-0.30.212/scripts/vpoldek
1309 --- util-vserver-0.30.212.org/scripts/vpoldek 1970-01-01 01:00:00.000000000 +0100
1310 +++ util-vserver-0.30.212/scripts/vpoldek 2007-02-04 18:20:38.673246000 +0100
1315 +# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
1317 +# This program is free software; you can redistribute it and/or modify
1318 +# it under the terms of the GNU General Public License as published by
1319 +# the Free Software Foundation; version 2 of the License.
1321 +# This program is distributed in the hope that it will be useful,
1322 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1323 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1324 +# GNU General Public License for more details.
1326 +# You should have received a copy of the GNU General Public License
1327 +# along with this program; if not, write to the Free Software
1328 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1330 +: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
1331 +test -e "$UTIL_VSERVER_VARS" || {
1332 + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
1335 +. "$UTIL_VSERVER_VARS"
1336 +. "$_LIB_FUNCTIONS"
1339 +function showHelp()
1342 +$"Usage: $0 <vserver-name>* [--all] -- <params>+
1344 +Report bugs to <$PACKAGE_BUGREPORT>."
1348 +function showVersion()
1351 +$"vpoldek $PACKAGE_VERSION -- poldek for vservers
1352 +This program is part of $PACKAGE_STRING
1354 +Copyright (C) 2003 Enrico Scholz
1355 +This program is free software; you may redistribute it under the terms of
1356 +the GNU General Public License. This program has absolutely no warranty."
1361 +declare -a vservers=()
1363 +while test "$#" -ge 1; do
1365 + --) shift; break;;
1366 + --help) showHelp $0;;
1367 + --quiet|-q) is_quiet=1 ;;
1369 + getAllVservers tmp
1370 + vservers=( "${vservers[@]}" "${tmp[@]}" )
1374 + *) vservers=( "${vservers[@]}" "$1" )
1381 +for i in "${vservers[@]}"; do
1384 + test -n "$is_quiet" || {
1385 + colorize bold echo -n "vpoldek: operating on vserver "
1386 + colorize bold colorize emph echo "$i"
1387 + xtermTitle "vpoldek: operating on vserver '$i' [$cnt/${#vservers[@]}]"
1390 + if pkgmgmt.isInternal "$i"; then
1391 + $_VSERVER "$i" exec poldek "$@"
1393 + callInNamespace "$i" \
1394 + "$_VNAMESPACE" --new -- "$_VPOLDEK_WORKER" "$i" "$@"
1398 + test $res -eq 0 -o -n "$is_quiet" || {
1399 + colorize error echo -n $"vpoldek failed on vserver '$i' with errorcode $res"
1403 + test -n "$is_quiet" || echo
1406 +test "$cnt" -ge 0 || echo "No vservers specified" >&2
1408 diff -urN util-vserver-0.30.212.org/scripts/vpoldek-worker util-vserver-0.30.212/scripts/vpoldek-worker
1409 --- util-vserver-0.30.212.org/scripts/vpoldek-worker 1970-01-01 01:00:00.000000000 +0100
1410 +++ util-vserver-0.30.212/scripts/vpoldek-worker 2007-02-04 18:20:38.673246000 +0100
1415 +# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
1417 +# This program is free software; you can redistribute it and/or modify
1418 +# it under the terms of the GNU General Public License as published by
1419 +# the Free Software Foundation; version 2 of the License.
1421 +# This program is distributed in the hope that it will be useful,
1422 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1423 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1424 +# GNU General Public License for more details.
1426 +# You should have received a copy of the GNU General Public License
1427 +# along with this program; if not, write to the Free Software
1428 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1432 +: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
1433 +test -e "$UTIL_VSERVER_VARS" || {
1434 + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
1437 +. "$UTIL_VSERVER_VARS"
1438 +. "$_LIB_FUNCTIONS"
1444 +pkgInit "$vserver" rpm poldek
1446 +test -z "$_POLDEK" || {
1447 + warning $"The environment variable \$_POLDEK is not supported anymore; please use \$POLDEK instead of"
1448 + ${POLDEK:=$_POLDEK}
1451 +exec ${_POLDEK:-poldek} \
1453 + --cachedir=$POLDEKCACHEDIR \
1454 + --conf=$POLDEK_CONFIG \
1455 + --pmcmd=$RPM_BINARY \
1457 diff -urN util-vserver-0.30.212.org/scripts/vserver-build util-vserver-0.30.212/scripts/vserver-build
1458 --- util-vserver-0.30.212.org/scripts/vserver-build 2006-12-09 17:15:24.000000000 +0100
1459 +++ util-vserver-0.30.212/scripts/vserver-build 2007-02-04 18:20:38.673246000 +0100
1461 yum ... -- -d <distribution>
1462 ... installs the base-packages of the given distribution with
1464 + poldek ... -- -d <distribution>
1465 + ... installs the base-packages of the given distribution with
1467 rpm ... -- [-d <distribution>] --empty|([--force] [--nodeps] <manifest>)+
1468 ... installs lists of rpm-packages
1469 skeleton ... -- [<cmd> <args>*]
1473 (xlegacy) exec $_VSERVER_LEGACY "$VSERVER_NAME" build "$@" ;;
1474 - (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync)
1475 + (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xpoldek)
1476 . $__PKGLIBDIR/vserver-build.$method
1478 (x) panic $"No build-method specified";;
1479 diff -urN util-vserver-0.30.212.org/scripts/vserver-build.functions util-vserver-0.30.212/scripts/vserver-build.functions
1480 --- util-vserver-0.30.212.org/scripts/vserver-build.functions 2006-12-09 17:15:24.000000000 +0100
1481 +++ util-vserver-0.30.212/scripts/vserver-build.functions 2007-02-04 18:20:38.673246000 +0100
1482 @@ -167,6 +167,12 @@
1483 elif test -e /etc/slackware-version; then
1484 set -- $(cat /etc/slackware-version)
1485 DISTRIBUTION=slackware$2
1486 + elif test -e /etc/pld-release; then
1489 + set -- $(cat /etc/pld-release)
1490 + DISTRIBUTION=pld-$(echo $2 | tr A-Z a-z)
1492 elif test -n "$1"; then
1495 diff -urN util-vserver-0.30.212.org/scripts/vserver-build.functions.poldek util-vserver-0.30.212/scripts/vserver-build.functions.poldek
1496 --- util-vserver-0.30.212.org/scripts/vserver-build.functions.poldek 1970-01-01 01:00:00.000000000 +0100
1497 +++ util-vserver-0.30.212/scripts/vserver-build.functions.poldek 2007-02-04 18:20:38.673246000 +0100
1499 +# $Id$ --*- sh -*--
1501 +# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
1503 +# This program is free software; you can redistribute it and/or modify
1504 +# it under the terms of the GNU General Public License as published by
1505 +# the Free Software Foundation; version 2 of the License.
1507 +# This program is distributed in the hope that it will be useful,
1508 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1509 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1510 +# GNU General Public License for more details.
1512 +# You should have received a copy of the GNU General Public License
1513 +# along with this program; if not, write to the Free Software
1514 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1516 +function poldek.installBasePackages
1521 + test "$dir" != / || return 0
1522 + for filelist in "$dir"/*; do
1523 + isRegularFile "$filelist" || continue
1525 + local can_fail=false
1526 + local flags='--install'
1528 + set -- $(<$filelist)
1529 + while test "$#" -gt 0; do
1531 + --reinstall) flags='--reinstall';;
1532 + --can-fail) can_fail=true;;
1537 + "$_VPOLDEK" "$name" -- $flags $* || $can_fail
1541 +function poldek.initVariables
1543 + findFile POLDEKCONFDEFAULT \
1544 + "$__CONFDIR/.distributions/$DISTRIBUTION/poldek/poldek.conf" \
1545 + "$__CONFDIR/.defaults/apps/pkgmgmt/poldek/poldek.conf" \
1546 + "$__DISTRIBDIR/$DISTRIBUTION/poldek/poldek.conf" \
1547 + "$__DISTRIBDIR/defaults/poldek/poldek.conf" \
1551 +function poldek.initFilesystem
1553 + mkdir -p "$PKGCFGDIR"/poldek/etc
1554 + mkdir -p "$PKGCFGBASE"/poldek-cache
1556 + $_LN_S "$PKGCFGBASE"/poldek-cache "$PKGCFGDIR"/poldek/cache
1558 + populateDirectory "$PKGCFGDIR/poldek/etc" \
1559 + "$__DISTRIBDIR/defaults/poldek" \
1560 + "$__DISTRIBDIR/$DISTRIBUTION/poldek" \
1561 + "$__CONFDIR/.distributions/$DISTRIBUTION/poldek"
1563 +# test -z "$POLDEKCONFDEFAULT" || \
1564 +# $_LN_S "$POLDEKCONFDEFAULT" "$PKGCFGDIR"/poldek/etc/
1566 diff -urN util-vserver-0.30.212.org/scripts/vserver-build.poldek util-vserver-0.30.212/scripts/vserver-build.poldek
1567 --- util-vserver-0.30.212.org/scripts/vserver-build.poldek 1970-01-01 01:00:00.000000000 +0100
1568 +++ util-vserver-0.30.212/scripts/vserver-build.poldek 2007-02-04 18:20:38.701247750 +0100
1570 +# $Id$ --*- sh -*--
1572 +# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
1574 +# This program is free software; you can redistribute it and/or modify
1575 +# it under the terms of the GNU General Public License as published by
1576 +# the Free Software Foundation; version 2 of the License.
1578 +# This program is distributed in the hope that it will be useful,
1579 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1580 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1581 +# GNU General Public License for more details.
1583 +# You should have received a copy of the GNU General Public License
1584 +# along with this program; if not, write to the Free Software
1585 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1587 +tmp=$(getopt -o +d: --long debug -n "$0" -- "$@") || exit 1
1590 +. "$_LIB_VSERVER_BUILD_FUNCTIONS_RPM"
1591 +. "$_LIB_VSERVER_BUILD_FUNCTIONS_POLDEK"
1592 +. "$_LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT"
1596 + (-d) DISTRIBUTION=$2; shift;;
1597 + (--debug) set -x;;
1598 + (--) shift; break ;;
1599 + (*) echo "vserver-build.poldek: internal error: unrecognized option '$1'" >&2
1610 +pkgmgmt.initVariables
1612 +poldek.initVariables
1614 +base.initFilesystem "$OPTION_FORCE"
1615 +pkgmgmt.initFilesystem "$OPTION_FORCE"
1617 +poldek.initFilesystem
1619 +setup_writeOption "$VSERVER_NAME"
1620 +setup_writeInitialFstab
1622 +test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"
1623 +rpm.initDB "$SETUP_CONFDIR"
1624 +rpm.importGPGPubKeys "$SETUP_CONFDIR" \
1625 + "$__CONFDIR/.distributions/$DISTRIBUTION/pubkeys" \
1626 + "$__CONFDIR/.distributions/.common/pubkeys" \
1627 + "$__DISTRIBDIR/$DISTRIBUTION/pubkeys"
1629 +$_VPOLDEK "$SETUP_CONFDIR" -- --update-whole
1630 +poldek.installBasePackages "$SETUP_CONFDIR" "$PKGINSTALLDIR"
1631 +test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"