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 19:00:38.703238500 +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 -i -e "s|%ARCH%|$$POLDEKARCH|g" $(DESTDIR)$(confdistribdir)/pld-*/poldek/pld-source.conf
42 $(mkinstalldirs) $(DESTDIR)$(confdir) \
43 $(DESTDIR)$(confdistribdir)/.common/pubkeys \
44 $(DESTDIR)$(confdefaultsdir) \
45 diff -urN util-vserver-0.30.212.org/distrib/pld-ac/pkgs/01 util-vserver-0.30.212/distrib/pld-ac/pkgs/01
46 --- util-vserver-0.30.212.org/distrib/pld-ac/pkgs/01 1970-01-01 01:00:00.000000000 +0100
47 +++ util-vserver-0.30.212/distrib/pld-ac/pkgs/01 2007-02-04 18:20:38.633243500 +0100
54 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
55 --- util-vserver-0.30.212.org/distrib/pld-ac/poldek/aliases.conf 1970-01-01 01:00:00.000000000 +0100
56 +++ util-vserver-0.30.212/distrib/pld-ac/poldek/aliases.conf 2007-02-04 18:20:38.637243750 +0100
58 +# System wide aliases
66 +freshen = install -FN
69 +# for backward compatybility, greedy is on by default now
70 +greedy-upgrade = install -FG
72 +just-install = install -IN
75 +what-requires = search -r
76 +what-provides = search -p
77 +rsearch = search --perlre
82 +#ls = uninstall kernel
88 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
89 --- util-vserver-0.30.212.org/distrib/pld-ac/poldek/fetch.conf 1970-01-01 01:00:00.000000000 +0100
90 +++ util-vserver-0.30.212/distrib/pld-ac/poldek/fetch.conf 2007-02-04 18:20:38.637243750 +0100
92 +# Configuration of poldek external file getters. Each [fetcher] section
93 +# declares one external downloader. The syntax is:
96 +# proto = PROTOCOL[ ,PROTOCOL... ]
97 +# cmd = CMD [OPTION...] DESTINATION-MACRO URL-MACRO
98 +# Possible parameters are:
101 +# Unique name of the fetcher. This is an optional parameter, if not set then
102 +# name is taken from the "cmd" parameter value as "$(basename $cmd)".
105 +# Protocol or protocols supported by fetcher. Name of the protocol can be
106 +# completely arbitrary, i.e. if you can handle protocol "foo" by writing
107 +# a script which takes URLs in form 'foo://'.
110 +# Parameter specifies an external command and its invoking syntax.
111 +# The syntax of "cmd" is:
112 +# cmd = COMMAND [ OPTION... ] {%d,%D} {%p,%P}[n]
113 +# Where COMMAND is the name or full path of command, OPTION is command specific
114 +# options. Macro '%d' is replaced with cache directory, '%D' is replaced with
115 +# 'cache directory/file basename', and '%p' with file basename, %P with file full
116 +# path (URL). Optional suffix 'n' with %p and %P means that command can be
117 +# invoked with multiple files at once.
118 +#cmd = foogetter.sh -N %D %Pn
120 +##Configured fetchers
123 +cmd = vfjuggle %d %Pn
126 +proto = http,ftp,https
127 +cmd = wget -N --dot-style=binary -P %d %Pn
139 +cmd = rsync -v %P %d
143 +cmd = vfsmb -v %P %d
147 +#cmd = vfssh.sh %d %Pn
151 +#cmd = foo.sh %d %Pn
154 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
155 --- util-vserver-0.30.212.org/distrib/pld-ac/poldek/pld-source.conf 1970-01-01 01:00:00.000000000 +0100
156 +++ util-vserver-0.30.212/distrib/pld-ac/poldek/pld-source.conf 2007-02-04 18:20:38.637243750 +0100
159 +# PLD <http://www.pld-linux.org/>
162 +_pld_prefix = ftp://ftp.ac.pld-linux.org/dists/ac
164 +## You can use them if you have better connection there
166 +#_pld_prefix = ftp://ftp.task.pld-linux.org/dists/ac
173 +type = %{_ac_idxtype}
175 +path = %{_pld_prefix}/PLD/%{_pld_arch}/PLD/RPMS/
178 +type = %{_ac_idxtype}
179 +name = ac-updates-security
180 +path = %{_pld_prefix}/updates/security/%{_pld_arch}/
183 +type = %{_ac_idxtype}
184 +name = ac-updates-general
185 +path = %{_pld_prefix}/updates/general/%{_pld_arch}/
189 +type = %{_ac_idxtype}
191 +path = %{_pld_prefix}/supported/%{_pld_arch}/
195 +type = %{_ac_idxtype}
197 +path = %{_pld_prefix}/ready/%{_pld_arch}/
201 +type = %{_ac_idxtype}
203 +path = %{_pld_prefix}/test/%{_pld_arch}/
205 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
206 --- util-vserver-0.30.212.org/distrib/pld-ac/poldek/poldek.conf 1970-01-01 01:00:00.000000000 +0100
207 +++ util-vserver-0.30.212/distrib/pld-ac/poldek/poldek.conf 2007-02-04 18:20:38.637243750 +0100
209 +# poldek main configuration file.
211 +# Some macros. Macros are local, they are not visible in included files
212 +# and macros declared in them are not visible to includer.
213 +# Macros names starts with underscore '_'.
217 +# Both local and remote files may be included. Included files may not contain
218 +# [global] section, it will be ignored anyway.
219 +%include %{_distro}-source.conf
222 +%include source.conf
224 +# External downloaders configuration, not necessary in most cases, cause
225 +# to internal HTTP and FTP client.
226 +#%include fetch.conf
231 +# This parameter allows to configure the default repository index type.
232 +#default index type = pndir
234 +# Cache directory for downloaded files. NOTE: that parent directory of cachedir
236 +#cachedir = $HOME/.poldek-cache
238 +# Switch to ordinary user at startup when executed by root
241 +# Permits using root privileges for installation only. Automatically turned
242 +# on when poldek executed as ordinary user.
245 +# Load /etc/apt/sources.list.
246 +#load apt sources list = no
248 +# Handle gzipped indexes externally (needed on RedHat 9 and Fedora Core 1 and 2).
249 +# This option is a workaround for broken zlib linked into librpm; with enabled
250 +# 'auto zlib in rpm' poldek tries to detect such case and then enables external
251 +# *.gz handling automatically.
252 +#vfile external compress = no
254 +# Auto detection of zlib linked into librpm. See 'vfile external compress'
256 +#auto zlib in rpm = yes
258 +# Automatically download whole index if incremental update fails.
261 +# Do not save given paths into created indexes. This option may significantly
262 +# reduce index size. Example (notice missing starting '/'):
263 +# exclude path = usr/share/doc:usr/share/man:usr/src
266 +# Full path name to a PM (rpm for now) binary.
267 +#pm command = /bin/rpm
269 +# Full path name to sudo binary.
270 +#sudo command = /usr/bin/sudo
273 +### File downloaders configuration
275 +# Send ${USER}@${HOSTNAME} as anonymous FTP password (by default
276 +# 'poldek@znienacka.net' is sent)
277 +#vfile ftp sysuser as anon passwd = no
279 +# File getters configuration parameter. By this option URL handlers may be configured.
280 +# To get file from HTTP and FTP servers poldek uses its internal client (what is
281 +# recommended), although it can be changedby this option. Others protocols handled
282 +# by external utilities can be configured also. The syntax is:
283 +# default fetcher = PROTOCOL[,PROTOCOL...]:FETCHER_NAME
285 +# where FETCHER_NAME is a name of one of the fetcher preconfigured in [fetch]
286 +# sections (placed in fetch.conf in default configuration).
288 +# default fetcher = ftp,http:internal
289 +# default fetcher = https:wget
290 +# default fetcher = cdrom:vfjuggle
291 +# vfjuggle is a cdrom getter supplied with poldek.
292 +#default fetcher = http,ftp: internal
294 +# Proxies for internal FTP and HTTP client may be configured in usual
295 +# way, by environment variables ftp_proxy and http_proxy, or by this option.
296 +# Its syntax is similar to "default fetcher" one:
297 +# proxy = PROTOCOL[,PROTOCOL...]:PROXY_URL
299 +# proxy = http: http://w3cache.foo.org:8080
302 +# Comma separated list of hosts or domains which will not be accessed via proxy.
303 +# Option overrides no_proxy environment variable.
305 +# noproxy = localhost, .pl, ftp.foo.bar.org
308 +# Internal HTTP and FTP client is stubborn, it retries to retrive
309 +# file if connection breaks. This option tells it how many times
311 +#vfile retries = 128
314 +### Installation options
316 +# Install packages in small groups instead of doing all-or-nothing
318 +particle install = no
320 +# Do not remove downloaded packages after its successful installation.
321 +#keep downloads = no
323 +# Controls visibility of multiple package instances with different EVR.
324 +# If on, only one, highest version will be visible.
325 +#unique package names = no
327 +# Epoch autopromotion during dependency comparision. RPM specific.
328 +# Set it up if you are using system with rpm prior to 4.2.1 version.
331 +# Confirm packages installation.
332 +#confirm installation = no
334 +# Confirm packages removal.
335 +#confirm removal = yes
337 +# Let the user select package among equivalents.
338 +choose equivalents manually = yes
340 +# Prevent package listed from being upgraded if they are already installed.
341 +# hold = kernel* dev
344 +# Ignore package list - packages fits given mask will be invisible.
345 +# ignore = *-smp-* foo*
346 +ignore = kernel* udev devfs
348 +# Conflicts with already installed packages are treated as resolved
349 +# if at least one of multiple-installed package satisfies conflict.
350 +# rpm doesn't support such cases, so --pm-nodeps is needed (use with
352 +#allow duplicates = yes
355 +### RPM specific options
357 +# rpm macros can be set by this option. Examples:
358 +# rpmdef = _install_langs pl:pl_PL:lt:lt_LT
359 +# Do not install any documentation:
360 +# rpmdef = _netsharedpath /usr/share/info:/usr/share/man
361 +# rpmdef = _excludedocs 1
365 +### Dependency processing settings
366 +# Subtle dependency processing options, they should not be changed
367 +# unless you know what you are doing
369 +# Automatically install packages required by installed ones.
372 +# Greedy upgrades, i.e. upgrade packages which dependencies are broken
373 +# by being uninstalled ones.
376 +# Be yet more greedy; if successor of orphaned package found, and this
377 +# successor drags no packages then upgrade the package instead of process
378 +# its dependencies. Option value is implied by 'greedy' one by defalut.
379 +#aggressive greedy = yes
381 +# Be tolerant for unmatched versioned dependencies which rpm tolerates, e.g.
382 +# package A requires capability foo >= 1.0 while package B provides "foo"
383 +# without any version. Use with care, it may cause weird dependency errors.
386 +# Taking into account package Obsoletes.
389 +# Taking into account package Conflicts.
391 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
392 --- util-vserver-0.30.212.org/distrib/pld-ac/poldek/source.conf 1970-01-01 01:00:00.000000000 +0100
393 +++ util-vserver-0.30.212/distrib/pld-ac/poldek/source.conf 2007-02-04 18:20:38.637243750 +0100
395 +# Sample poldek sources configuration
396 +# Every source is configured in his own [source] section.
397 +# Possible parameters are:
400 +# Unique name of the repository.
403 +# Type of repository index. Permitted values are 'pndir', 'pdir', 'apt', 'yum'
404 +# and 'dir' as listed by --stl switch.
407 +# This parameter sets index original type i.e type of repository
408 +# from what this repository is created. Default is 'dir' - means
409 +# that directory of packages is scanned.
410 +#original type = dir
412 +# Unique name of the repository. May be either path or URL.
413 +#path = /some/url/or/dir
415 +# If package index and packages are stored in different locations then
416 +# prefix stands for packages path.
417 +#prefix = /some/url/or/dir
419 +# Controls visibility of multiple package instances with different EVR.
420 +# If on, only one, highest version will be visible.
423 +# Repository priority. If the same packages (equal names and EVR)
424 +# are available in more than one source then package from highest
425 +# prioritized source are taken. Priority is numeric value. Lower number
426 +# means higher priority, and negative priorities are allowed.
427 +# Priority is numeric value.
430 +# Controling if repository index will be implicit loaded. Set it off if
431 +# the index should be loaded on demand only, i.e. if specified directly
435 +# Controls if repository index will be implicit updated. Set it off if
436 +# the index should be updated on demand only, i.e. if specified directly
440 +# Packages PGP/GPG signatures (if any) will be verified before their
444 +# Have the same meaning as [global] parameter. Example:
445 +# hold = kernel* dev
448 +# Have the same meaning as [global] parameter. Example:
449 +# ignore = kernel*smp* dev
452 +# Parameter have the same meaning as [global] parameter.
453 +# exclude path = usr/share/doc:usr/share/man:usr/src
456 +# Preferred language of package descriptions. If not set, taken from locale
457 +# settings. Example:
458 +# lang = pl_PL:lt_LT
464 +path = $HOME/rpm/RPMS
471 +#path = ftp://ftp.foo.bar.org/RPMS/
477 +#ignore = kernel*-smp-*
480 diff -urN util-vserver-0.30.212.org/distrib/pld-ac/rpm/macros util-vserver-0.30.212/distrib/pld-ac/rpm/macros
481 --- util-vserver-0.30.212.org/distrib/pld-ac/rpm/macros 1970-01-01 01:00:00.000000000 +0100
482 +++ util-vserver-0.30.212/distrib/pld-ac/rpm/macros 2007-02-04 18:20:38.637243750 +0100
484 +# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
485 +# you have to use at least one language beside 'C'
486 +%_install_langs C:en:pl
487 +%_netsharedpath /dev
488 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
489 --- util-vserver-0.30.212.org/distrib/pld-ac/rpmlist.d/00.lst 1970-01-01 01:00:00.000000000 +0100
490 +++ util-vserver-0.30.212/distrib/pld-ac/rpmlist.d/00.lst 2007-02-04 18:20:38.637243750 +0100
501 +vserver-packages-*.rpm
502 diff -urN util-vserver-0.30.212.org/distrib/pld-th/pkgs/01 util-vserver-0.30.212/distrib/pld-th/pkgs/01
503 --- util-vserver-0.30.212.org/distrib/pld-th/pkgs/01 1970-01-01 01:00:00.000000000 +0100
504 +++ util-vserver-0.30.212/distrib/pld-th/pkgs/01 2007-02-04 18:20:38.633243000 +0100
511 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
512 --- util-vserver-0.30.212.org/distrib/pld-th/poldek/aliases.conf 1970-01-01 01:00:00.000000000 +0100
513 +++ util-vserver-0.30.212/distrib/pld-th/poldek/aliases.conf 2007-02-04 18:20:38.637243000 +0100
515 +# System wide aliases
523 +freshen = install -FN
524 +upgrade = install -F
526 +# for backward compatybility, greedy is on by default now
527 +greedy-upgrade = install -FG
529 +just-install = install -IN
532 +what-requires = search -r
533 +what-provides = search -p
534 +rsearch = search --perlre
539 +#ls = uninstall kernel
545 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
546 --- util-vserver-0.30.212.org/distrib/pld-th/poldek/fetch.conf 1970-01-01 01:00:00.000000000 +0100
547 +++ util-vserver-0.30.212/distrib/pld-th/poldek/fetch.conf 2007-02-04 18:20:38.637243000 +0100
549 +# Configuration of poldek external file getters. Each [fetcher] section
550 +# declares one external downloader. The syntax is:
553 +# proto = PROTOCOL[ ,PROTOCOL... ]
554 +# cmd = CMD [OPTION...] DESTINATION-MACRO URL-MACRO
555 +# Possible parameters are:
558 +# Unique name of the fetcher. This is an optional parameter, if not set then
559 +# name is taken from the "cmd" parameter value as "$(basename $cmd)".
562 +# Protocol or protocols supported by fetcher. Name of the protocol can be
563 +# completely arbitrary, i.e. if you can handle protocol "foo" by writing
564 +# a script which takes URLs in form 'foo://'.
567 +# Parameter specifies an external command and its invoking syntax.
568 +# The syntax of "cmd" is:
569 +# cmd = COMMAND [ OPTION... ] {%d,%D} {%p,%P}[n]
570 +# Where COMMAND is the name or full path of command, OPTION is command specific
571 +# options. Macro '%d' is replaced with cache directory, '%D' is replaced with
572 +# 'cache directory/file basename', and '%p' with file basename, %P with file full
573 +# path (URL). Optional suffix 'n' with %p and %P means that command can be
574 +# invoked with multiple files at once.
575 +#cmd = foogetter.sh -N %D %Pn
577 +##Configured fetchers
580 +cmd = vfjuggle %d %Pn
583 +proto = http,ftp,https
584 +cmd = wget -N --dot-style=binary -P %d %Pn
596 +cmd = rsync -v %P %d
600 +cmd = vfsmb -v %P %d
604 +#cmd = vfssh.sh %d %Pn
608 +#cmd = foo.sh %d %Pn
611 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
612 --- util-vserver-0.30.212.org/distrib/pld-th/poldek/pld-source.conf 1970-01-01 01:00:00.000000000 +0100
613 +++ util-vserver-0.30.212/distrib/pld-th/poldek/pld-source.conf 2007-02-04 18:25:33.175651250 +0100
615 +# PLD <http://www.pld-linux.org/>
618 +_pld_prefix = ftp://ftp.th.pld-linux.org/dists/th
620 +## You can use them if you have better connection there
622 +#_pld_prefix = ftp://ftp.task.pld-linux.org/dists/th
629 +type = %{_th_idxtype}
631 +path = %{_pld_prefix}/PLD/%{_pld_arch}/RPMS/
634 +type = %{_th_idxtype}
636 +path = %{_pld_prefix}/PLD/noarch/RPMS/
639 +type = %{_th_idxtype}
640 +name = th-updates-security
641 +path = %{_pld_prefix}/updates-security/%{_pld_arch}/RPMS/
644 +type = %{_th_idxtype}
645 +name = th-updates-general
646 +path = %{_pld_prefix}/updates-general/%{_pld_arch}/RPMS/
650 +#type = %{_th_idxtype}
651 +#name = th-supported
652 +#path = %{_pld_prefix}/supported/%{_pld_arch}/RPMS/
656 +type = %{_th_idxtype}
658 +path = %{_pld_prefix}/ready/%{_pld_arch}/RPMS/
662 +type = %{_th_idxtype}
664 +path = %{_pld_prefix}/test/%{_pld_arch}/RPMS/
666 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
667 --- util-vserver-0.30.212.org/distrib/pld-th/poldek/poldek.conf 1970-01-01 01:00:00.000000000 +0100
668 +++ util-vserver-0.30.212/distrib/pld-th/poldek/poldek.conf 2007-02-04 18:20:38.637243000 +0100
670 +# poldek main configuration file.
672 +# Some macros. Macros are local, they are not visible in included files
673 +# and macros declared in them are not visible to includer.
674 +# Macros names starts with underscore '_'.
678 +# Both local and remote files may be included. Included files may not contain
679 +# [global] section, it will be ignored anyway.
680 +%include %{_distro}-source.conf
683 +%include source.conf
685 +# External downloaders configuration, not necessary in most cases, cause
686 +# to internal HTTP and FTP client.
687 +#%include fetch.conf
692 +# This parameter allows to configure the default repository index type.
693 +#default index type = pndir
695 +# Cache directory for downloaded files. NOTE: that parent directory of cachedir
697 +#cachedir = $HOME/.poldek-cache
699 +# Switch to ordinary user at startup when executed by root
702 +# Permits using root privileges for installation only. Automatically turned
703 +# on when poldek executed as ordinary user.
706 +# Load /etc/apt/sources.list.
707 +#load apt sources list = no
709 +# Handle gzipped indexes externally (needed on RedHat 9 and Fedora Core 1 and 2).
710 +# This option is a workaround for broken zlib linked into librpm; with enabled
711 +# 'auto zlib in rpm' poldek tries to detect such case and then enables external
712 +# *.gz handling automatically.
713 +#vfile external compress = no
715 +# Auto detection of zlib linked into librpm. See 'vfile external compress'
717 +#auto zlib in rpm = yes
719 +# Automatically download whole index if incremental update fails.
722 +# Do not save given paths into created indexes. This option may significantly
723 +# reduce index size. Example (notice missing starting '/'):
724 +# exclude path = usr/share/doc:usr/share/man:usr/src
727 +# Full path name to a PM (rpm for now) binary.
728 +#pm command = /bin/rpm
730 +# Full path name to sudo binary.
731 +#sudo command = /usr/bin/sudo
734 +### File downloaders configuration
736 +# Send ${USER}@${HOSTNAME} as anonymous FTP password (by default
737 +# 'poldek@znienacka.net' is sent)
738 +#vfile ftp sysuser as anon passwd = no
740 +# File getters configuration parameter. By this option URL handlers may be configured.
741 +# To get file from HTTP and FTP servers poldek uses its internal client (what is
742 +# recommended), although it can be changedby this option. Others protocols handled
743 +# by external utilities can be configured also. The syntax is:
744 +# default fetcher = PROTOCOL[,PROTOCOL...]:FETCHER_NAME
746 +# where FETCHER_NAME is a name of one of the fetcher preconfigured in [fetch]
747 +# sections (placed in fetch.conf in default configuration).
749 +# default fetcher = ftp,http:internal
750 +# default fetcher = https:wget
751 +# default fetcher = cdrom:vfjuggle
752 +# vfjuggle is a cdrom getter supplied with poldek.
753 +#default fetcher = http,ftp: internal
755 +# Proxies for internal FTP and HTTP client may be configured in usual
756 +# way, by environment variables ftp_proxy and http_proxy, or by this option.
757 +# Its syntax is similar to "default fetcher" one:
758 +# proxy = PROTOCOL[,PROTOCOL...]:PROXY_URL
760 +# proxy = http: http://w3cache.foo.org:8080
763 +# Comma separated list of hosts or domains which will not be accessed via proxy.
764 +# Option overrides no_proxy environment variable.
766 +# noproxy = localhost, .pl, ftp.foo.bar.org
769 +# Internal HTTP and FTP client is stubborn, it retries to retrive
770 +# file if connection breaks. This option tells it how many times
772 +#vfile retries = 128
775 +### Installation options
777 +# Install packages in small groups instead of doing all-or-nothing
779 +particle install = no
781 +# Do not remove downloaded packages after its successful installation.
782 +#keep downloads = no
784 +# Controls visibility of multiple package instances with different EVR.
785 +# If on, only one, highest version will be visible.
786 +#unique package names = no
788 +# Epoch autopromotion during dependency comparision. RPM specific.
789 +# Set it up if you are using system with rpm prior to 4.2.1 version.
792 +# Confirm packages installation.
793 +#confirm installation = no
795 +# Confirm packages removal.
796 +#confirm removal = yes
798 +# Let the user select package among equivalents.
799 +choose equivalents manually = yes
801 +# Prevent package listed from being upgraded if they are already installed.
802 +# hold = kernel* dev
805 +# Ignore package list - packages fits given mask will be invisible.
806 +# ignore = *-smp-* foo*
807 +ignore = kernel* udev devfs
809 +# Conflicts with already installed packages are treated as resolved
810 +# if at least one of multiple-installed package satisfies conflict.
811 +# rpm doesn't support such cases, so --pm-nodeps is needed (use with
813 +#allow duplicates = yes
816 +### RPM specific options
818 +# rpm macros can be set by this option. Examples:
819 +# rpmdef = _install_langs pl:pl_PL:lt:lt_LT
820 +# Do not install any documentation:
821 +# rpmdef = _netsharedpath /usr/share/info:/usr/share/man
822 +# rpmdef = _excludedocs 1
826 +### Dependency processing settings
827 +# Subtle dependency processing options, they should not be changed
828 +# unless you know what you are doing
830 +# Automatically install packages required by installed ones.
833 +# Greedy upgrades, i.e. upgrade packages which dependencies are broken
834 +# by being uninstalled ones.
837 +# Be yet more greedy; if successor of orphaned package found, and this
838 +# successor drags no packages then upgrade the package instead of process
839 +# its dependencies. Option value is implied by 'greedy' one by defalut.
840 +#aggressive greedy = yes
842 +# Be tolerant for unmatched versioned dependencies which rpm tolerates, e.g.
843 +# package A requires capability foo >= 1.0 while package B provides "foo"
844 +# without any version. Use with care, it may cause weird dependency errors.
847 +# Taking into account package Obsoletes.
850 +# Taking into account package Conflicts.
852 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
853 --- util-vserver-0.30.212.org/distrib/pld-th/poldek/source.conf 1970-01-01 01:00:00.000000000 +0100
854 +++ util-vserver-0.30.212/distrib/pld-th/poldek/source.conf 2007-02-04 18:20:38.637243000 +0100
856 +# Sample poldek sources configuration
857 +# Every source is configured in his own [source] section.
858 +# Possible parameters are:
861 +# Unique name of the repository.
864 +# Type of repository index. Permitted values are 'pndir', 'pdir', 'apt', 'yum'
865 +# and 'dir' as listed by --stl switch.
868 +# This parameter sets index original type i.e type of repository
869 +# from what this repository is created. Default is 'dir' - means
870 +# that directory of packages is scanned.
871 +#original type = dir
873 +# Unique name of the repository. May be either path or URL.
874 +#path = /some/url/or/dir
876 +# If package index and packages are stored in different locations then
877 +# prefix stands for packages path.
878 +#prefix = /some/url/or/dir
880 +# Controls visibility of multiple package instances with different EVR.
881 +# If on, only one, highest version will be visible.
884 +# Repository priority. If the same packages (equal names and EVR)
885 +# are available in more than one source then package from highest
886 +# prioritized source are taken. Priority is numeric value. Lower number
887 +# means higher priority, and negative priorities are allowed.
888 +# Priority is numeric value.
891 +# Controling if repository index will be implicit loaded. Set it off if
892 +# the index should be loaded on demand only, i.e. if specified directly
896 +# Controls if repository index will be implicit updated. Set it off if
897 +# the index should be updated on demand only, i.e. if specified directly
901 +# Packages PGP/GPG signatures (if any) will be verified before their
905 +# Have the same meaning as [global] parameter. Example:
906 +# hold = kernel* dev
909 +# Have the same meaning as [global] parameter. Example:
910 +# ignore = kernel*smp* dev
913 +# Parameter have the same meaning as [global] parameter.
914 +# exclude path = usr/share/doc:usr/share/man:usr/src
917 +# Preferred language of package descriptions. If not set, taken from locale
918 +# settings. Example:
919 +# lang = pl_PL:lt_LT
925 +path = $HOME/rpm/RPMS
932 +#path = ftp://ftp.foo.bar.org/RPMS/
938 +#ignore = kernel*-smp-*
941 diff -urN util-vserver-0.30.212.org/distrib/pld-th/rpm/macros util-vserver-0.30.212/distrib/pld-th/rpm/macros
942 --- util-vserver-0.30.212.org/distrib/pld-th/rpm/macros 1970-01-01 01:00:00.000000000 +0100
943 +++ util-vserver-0.30.212/distrib/pld-th/rpm/macros 2007-02-04 18:20:38.637243000 +0100
945 +# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
946 +# you have to use at least one language beside 'C'
947 +%_install_langs C:en:pl
948 +%_netsharedpath /dev
949 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
950 --- util-vserver-0.30.212.org/distrib/pld-th/rpmlist.d/00.lst 1970-01-01 01:00:00.000000000 +0100
951 +++ util-vserver-0.30.212/distrib/pld-th/rpmlist.d/00.lst 2007-02-04 18:20:38.637243000 +0100
962 +vserver-packages-*.rpm
963 diff -urN util-vserver-0.30.212.org/scripts/functions util-vserver-0.30.212/scripts/functions
964 --- util-vserver-0.30.212.org/scripts/functions 2006-12-09 17:15:24.000000000 +0100
965 +++ util-vserver-0.30.212/scripts/functions 2007-02-04 18:20:38.637243750 +0100
970 +function _pkgSetVarsPoldek
972 + if test -n "$PKGDIR"; then
973 + findDir POLDEKETCDIR $PKGDIR/poldeketc $PKGDIR/base/poldek/etc /etc/poldek
974 + findDir POLDEKCACHEDIR $PKGDIR/poldek-cache $PKGDIR/base/poldek/cache
976 + findDir POLDEKETCDIR "$VDIR"/etc/poldek /etc/poldek
977 + findDir POLDEKCACHEDIR "$VDIR"/var/tmp/poldek-cache
980 + findFile POLDEK_CONFIG "$POLDEKETCDIR"/poldek.conf ""
981 + test -z "$POLDEK_CONFIG" || export POLDEK_CONFIG
985 function _pkgMountBase
988 rpm) _pkgSetVarsRPM;;
989 apt) _pkgSetVarsApt;;
990 yum) _pkgSetVarsYum;;
991 + poldek) _pkgSetVarsPoldek;;
992 *) echo "Unknown packaging flavor" >&2; exit 1;;
997 elif test -e "$_pgs_vdir"/etc/mandrake-release; then
999 + elif test -e "$_pgs_vdir"/etc/pld-release; then
1001 elif test -e "$_pgs_vdir"/etc/debian_version; then
1003 elif test -e "$_pgs_vdir"/etc/SuSE-release; then
1004 @@ -817,6 +834,27 @@
1005 test -n "$have_yum" && return 0 || return 1
1008 +## Usage: pkgmgmt.isPoldekAvailable <cfgdir> <vdir> [<is-internal>]
1009 +function pkgmgmt.isPoldekAvailable
1013 + local is_internal="$3"
1015 + local have_poldek i
1016 + if test -n "$is_internal"; then
1018 + test -d "$cfgdir"/base/poldek -o -d "$cfgdir"/poldeketc || have_poldek=
1021 + for i in /bin /usr/bin /usr/local/bin; do
1022 + test ! -x "$vdir$i"/poldek || { have_poldek=1; break; }
1026 + test -n "$have_poldek" && return 0 || return 1
1030 function vshelper.doSanityCheck
1032 diff -urN util-vserver-0.30.212.org/scripts/Makefile-files util-vserver-0.30.212/scripts/Makefile-files
1033 --- util-vserver-0.30.212.org/scripts/Makefile-files 2006-12-09 17:15:24.000000000 +0100
1034 +++ util-vserver-0.30.212/scripts/Makefile-files 2007-02-04 18:20:38.669245750 +0100
1036 scripts/vapt-get-worker \
1037 scripts/vrpm-worker \
1038 scripts/vyum-worker \
1039 + scripts/vpoldek-worker \
1040 scripts/vrpm-preload \
1041 scripts/save_s_context \
1042 scripts/vservers.grabinfo.sh \
1044 scripts/vserver-build.yum \
1045 scripts/vserver-build.template \
1046 scripts/vserver-build.rsync \
1047 + scripts/vserver-build.poldek \
1048 scripts/vserver-build.functions \
1049 scripts/vserver-build.functions.apt \
1050 scripts/vserver-build.functions.rpm \
1051 scripts/vserver-build.functions.pkgmgmt \
1052 scripts/vserver-build.functions.yum \
1053 + scripts/vserver-build.functions.poldek \
1054 scripts/vserver-setup.functions \
1055 scripts/vserver.functions \
1056 scripts/vserver.start \
1058 scripts_pkglib_src_SCRPTS = scripts/pkgmgmt \
1059 scripts/vapt-get-worker \
1061 + scripts/vpoldek-worker \
1062 scripts/vrpm-worker \
1063 scripts/vrpm-preload \
1064 scripts/start-vservers \
1066 scripts_sbin_src_PRGS = scripts/chbind \
1070 scripts/vdispatch-conf \
1073 diff -urN util-vserver-0.30.212.org/scripts/pkgmgmt util-vserver-0.30.212/scripts/pkgmgmt
1074 --- util-vserver-0.30.212.org/scripts/pkgmgmt 2006-12-09 17:15:24.000000000 +0100
1075 +++ util-vserver-0.30.212/scripts/pkgmgmt 2007-02-04 18:20:38.673246000 +0100
1080 - (RH) pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum "${YUM_RELEASEPKGS[@]}")
1081 + (RH) pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum poldek "${YUM_RELEASEPKGS[@]}")
1082 hasSubstring "$pkgs" ---rpm--- || {
1084 * The vserver does not seem to have the 'rpm' package which is required
1089 - hasSubstring "$pkgs" ---apt--- ---yum--- || {
1090 + hasSubstring "$pkgs" ---apt--- ---yum--- ---poldek--- || {
1092 -* The vserver does not seem to have a depsolver like 'apt' or 'yum'
1093 +* The vserver does not seem to have a depsolver like 'apt', 'yum' or 'poldek'
1094 installed. It is suggested to install such a program before setting
1095 up internal package management."
1097 @@ -368,6 +368,131 @@
1101 +function processVserver_PLD()
1104 + local is_internalize=$2
1108 + cfgdir=$($_VSERVER_INFO "$vserver" APPDIR pkgmgmt) || \
1109 + cfgdir=$($_VSERVER_INFO "$vserver" APPDIR)/pkgmgmt
1111 + ## Figure out the environment....
1112 + pkgmgmt.isPoldekAvailable "$cfgdir" "$vdir" "$is_internalize" || have_poldek=
1114 + local POLDEKETCDIR=
1115 + local POLDEKCACHEDIR=
1117 + local RPMSTATEDIR=
1119 + ## Create directories and assign variables where configuration
1120 + ## can/will be found on the host
1121 + if test -n "$is_internalize"; then
1122 + verifyInternalPackages "$vserver" RH || test -n "$IS_FORCE" ||
1124 +Can not continue; use '--force' to override this check"
1126 + pushd "$vdir" >/dev/null
1128 + test ! -L var/lib/rpm || {
1129 + $_EXEC_CD /var/lib $_RM rpm &&
1130 + $_EXEC_CD /var/lib $_MKDIR -m755 rpm &&
1131 + $_EXEC_CD /var/lib $_CHOWN rpm:rpm rpm ||
1133 + } </dev/null 2>/dev/null
1135 + for i in var/tmp/poldek-cache etc/rpm etc/poldek; do
1137 + $_EXEC_CD /$(dirname "$i") $_MKDIR -m755 $(basename "$i") || :
1142 + if test -n "$have_poldek"; then
1143 + findDir POLDEKETCDIR "$cfgdir"/poldeketc "$cfgdir"/base/poldek/etc /etc/poldek
1146 + findDir RPMETCDIR "$cfgdir"/rpmetc "$cfgdir"/base/rpm/etc /etc/rpm /
1147 + findDir RPMSTATEDIR "$cfgdir"/rpmstate "$cfgdir"/base/rpm/state
1149 + mkdir -m755 -p "$cfgdir"
1152 + if test -n "$have_poldek"; then
1153 + findDir POLDEKETCDIR "$cfgdir"/poldeketc "$cfgdir"/base/poldek/etc /
1154 + findDir POLDEKCACHEDIR "$cfgdir"/poldek-cache "$cfgdir"/base/poldek/cache /
1156 + test "$POLDEKETCDIR" != / || POLDEKETCDIR=$cfgdir/base/poldek/etc
1157 + test "$POLDEKCACHEDIR" != / || POLDEKCACHEDIR=$cfgdir/base/poldek/cache
1159 + test -d "$cfgdir"/poldeketc -a -d "$cfgdir"/poldek-cache || need_base=1
1162 + findDir RPMETCDIR "$cfgdir"/rpmetc "$cfgdir"/base/rpm/etc /
1163 + findDir RPMSTATEDIR "$cfgdir"/rpmstate "$cfgdir"/base/rpm/state /
1165 + test "$RPMETCDIR" != / || RPMETCDIR=$cfgdir/base/rpm/etc
1166 + test "$RPMSTATEDIR" != / || RPMSTATEDIR=$cfgdir/base/rpm/state
1168 + test -d "$cfgdir"/rpmetc -a -d "$cfgdir"/rpmstate || need_base=1
1169 + test ! -e "$cfgdir"/base || need_base=
1171 + test -z "$need_base" || ln -s "$PKGCFGDIR" "$cfgdir"/base
1173 + mkdir -m755 -p "$PKGCFGDIR"
1174 + _createDirs "$POLDEKETCDIR" "$POLDEKCACHEDIR" \
1175 + "$RPMETCDIR" "$RPMSTATEDIR"
1178 + ## Copy the files...
1179 + if test -n "$is_internalize"; then
1180 + if test -n "$have_poldek"; then
1181 + _copySecure "$vdir" "$POLDEKETCDIR" /etc/poldek
1182 + pushd "$vdir" >/dev/null
1183 + _hashAuto /etc/poldek.conf '/'
1187 + _copySecure "$vdir" "$RPMETCDIR" /etc/rpm
1188 + _copySecure "$vdir" "$RPMSTATEDIR" /var/lib/rpm
1190 + pushd "$vdir" >/dev/null
1191 + ## remove %_dbpath settings
1192 + _substFile /etc/rpm/macros '/^%_dbpath[ \t].*/D'
1195 + if test -n "$have_poldek"; then
1196 + _copySecureRev "$vdir" /etc/poldek "$POLDEKETCDIR"
1197 + _unhashAuto "$POLDEKETCDIR"/poldek.conf '/'
1200 + _copySecureRev "$vdir" /etc/rpm "$RPMETCDIR"
1201 + _copySecureRev "$vdir" /var/lib/rpm "$RPMSTATEDIR"
1203 + echo -e "%_dbpath\t\t$rpmdb_mntpoint" >>$RPMETCDIR/macros
1207 + if test -n "$is_internalize"; then
1210 + tmpdir=$($_MKTEMPDIR -p /var/tmp pgmgmt.XXXXXX)
1211 + trap "$_RM -rf $tmpdir" EXIT
1212 + pushd "$vdir" >/dev/null
1213 + $_EXEC_CD /var/lib $_MV rpm $tmpdir/
1214 + $_EXEC_CD /var/lib $_LN_S "$rpmdb_mntpoint" rpm
1219 + if test -n "$is_internalize"; then
1220 + $_TOUCH "$cfgdir"/internal
1222 + $_RM -f "$cfgdir"/internal
1226 function processVserver_Debian()
1232 (redhat|mandrake) processVserver_RH "$vserver" "$IS_INTERNALIZE";;
1233 + (pld) processVserver_PLD "$vserver" "$IS_INTERNALIZE";;
1234 (debian) processVserver_Debian "$vserver" "$IS_INTERNALIZE";;
1236 echo $"Vserver style '$style' is not supported for packagemanagment" >&2
1237 diff -urN util-vserver-0.30.212.org/scripts/util-vserver-vars.pathsubst util-vserver-0.30.212/scripts/util-vserver-vars.pathsubst
1238 --- util-vserver-0.30.212.org/scripts/util-vserver-vars.pathsubst 2006-12-09 17:15:24.000000000 +0100
1239 +++ util-vserver-0.30.212/scripts/util-vserver-vars.pathsubst 2007-02-04 18:20:38.673246000 +0100
1241 _LIB_VSERVER_BUILD_FUNCTIONS_RPM="$__PKGLIBDIR/vserver-build.functions.rpm"
1242 _LIB_VSERVER_BUILD_FUNCTIONS_YUM="$__PKGLIBDIR/vserver-build.functions.yum"
1243 _LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT="$__PKGLIBDIR/vserver-build.functions.pkgmgmt"
1244 +_LIB_VSERVER_BUILD_FUNCTIONS_POLDEK="$__PKGLIBDIR/vserver-build.functions.poldek"
1245 _LISTDEVIP="$__LEGACYDIR/listdevip"
1246 _LOCKFILE="$__PKGLIBDIR/lockfile"
1247 _MASK2PREFIX="$__PKGLIBDIR/mask2prefix"
1249 _VUNIFY="$__PKGLIBDIR/vunify"
1250 _VYUM="$__SBINDIR/vyum"
1251 _VYUM_WORKER="$__PKGLIBDIR/vyum-worker"
1252 +_VPOLDEK="$__SBINDIR/vpoldek"
1253 +_VPOLDEK_WORKER="$__PKGLIBDIR/vpoldek-worker"
1257 diff -urN util-vserver-0.30.212.org/scripts/vpkg util-vserver-0.30.212/scripts/vpkg
1258 --- util-vserver-0.30.212.org/scripts/vpkg 2006-12-09 17:15:24.000000000 +0100
1259 +++ util-vserver-0.30.212/scripts/vpkg 2007-02-04 18:20:38.673246000 +0100
1260 @@ -115,6 +115,44 @@
1268 + ## rpm outputs sometimes '(contains no files)', so return
1269 + ## only the valid output
1271 + rpm_param=( -qac --pipe "$_SED '\!^/!p;d'" );;
1273 + rpm_param=( -Uvh "$@" )
1274 + poldek_param=( --install -v "$@" )
1278 + if test -n "$is_external"; then
1280 + test -d "$cfgdir"/base/poldek -o -d "$cfgdir"/poldeketc || have_poldek=
1283 + for i in /bin /usr/bin /usr/local/bin; do
1284 + test ! -x "$vdir$i"/poldek || { have_poldek=1; break; }
1288 + if test -n "$is_external"; then
1289 + if test "$have_poldek" -a "$poldek_param"; then
1290 + cmd=( "$_VPOLDEK" "$vserver" -- "${poldek_param[@]}" )
1292 + cmd=( "$_VRPM" "$vserver" -- "${rpm_param[@]}" )
1295 + if test "$have_poldek" -a "$poldek_param"; then
1296 + cmd=( "$_VSERVER" --silent "$vserver" exec poldek "${poldek_param[@]}" )
1298 + cmd=( "$_VSERVER" --silent "$vserver" exec rpm "${rpm_param[@]}" )
1305 diff -urN util-vserver-0.30.212.org/scripts/vpoldek util-vserver-0.30.212/scripts/vpoldek
1306 --- util-vserver-0.30.212.org/scripts/vpoldek 1970-01-01 01:00:00.000000000 +0100
1307 +++ util-vserver-0.30.212/scripts/vpoldek 2007-02-04 18:20:38.673246000 +0100
1312 +# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
1314 +# This program is free software; you can redistribute it and/or modify
1315 +# it under the terms of the GNU General Public License as published by
1316 +# the Free Software Foundation; version 2 of the License.
1318 +# This program is distributed in the hope that it will be useful,
1319 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1320 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1321 +# GNU General Public License for more details.
1323 +# You should have received a copy of the GNU General Public License
1324 +# along with this program; if not, write to the Free Software
1325 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1327 +: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
1328 +test -e "$UTIL_VSERVER_VARS" || {
1329 + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
1332 +. "$UTIL_VSERVER_VARS"
1333 +. "$_LIB_FUNCTIONS"
1336 +function showHelp()
1339 +$"Usage: $0 <vserver-name>* [--all] -- <params>+
1341 +Report bugs to <$PACKAGE_BUGREPORT>."
1345 +function showVersion()
1348 +$"vpoldek $PACKAGE_VERSION -- poldek for vservers
1349 +This program is part of $PACKAGE_STRING
1351 +Copyright (C) 2003 Enrico Scholz
1352 +This program is free software; you may redistribute it under the terms of
1353 +the GNU General Public License. This program has absolutely no warranty."
1358 +declare -a vservers=()
1360 +while test "$#" -ge 1; do
1362 + --) shift; break;;
1363 + --help) showHelp $0;;
1364 + --quiet|-q) is_quiet=1 ;;
1366 + getAllVservers tmp
1367 + vservers=( "${vservers[@]}" "${tmp[@]}" )
1371 + *) vservers=( "${vservers[@]}" "$1" )
1378 +for i in "${vservers[@]}"; do
1381 + test -n "$is_quiet" || {
1382 + colorize bold echo -n "vpoldek: operating on vserver "
1383 + colorize bold colorize emph echo "$i"
1384 + xtermTitle "vpoldek: operating on vserver '$i' [$cnt/${#vservers[@]}]"
1387 + if pkgmgmt.isInternal "$i"; then
1388 + $_VSERVER "$i" exec poldek "$@"
1390 + callInNamespace "$i" \
1391 + "$_VNAMESPACE" --new -- "$_VPOLDEK_WORKER" "$i" "$@"
1395 + test $res -eq 0 -o -n "$is_quiet" || {
1396 + colorize error echo -n $"vpoldek failed on vserver '$i' with errorcode $res"
1400 + test -n "$is_quiet" || echo
1403 +test "$cnt" -ge 0 || echo "No vservers specified" >&2
1405 diff -urN util-vserver-0.30.212.org/scripts/vpoldek-worker util-vserver-0.30.212/scripts/vpoldek-worker
1406 --- util-vserver-0.30.212.org/scripts/vpoldek-worker 1970-01-01 01:00:00.000000000 +0100
1407 +++ util-vserver-0.30.212/scripts/vpoldek-worker 2007-02-04 18:20:38.673246000 +0100
1412 +# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
1414 +# This program is free software; you can redistribute it and/or modify
1415 +# it under the terms of the GNU General Public License as published by
1416 +# the Free Software Foundation; version 2 of the License.
1418 +# This program is distributed in the hope that it will be useful,
1419 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1420 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1421 +# GNU General Public License for more details.
1423 +# You should have received a copy of the GNU General Public License
1424 +# along with this program; if not, write to the Free Software
1425 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1429 +: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
1430 +test -e "$UTIL_VSERVER_VARS" || {
1431 + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
1434 +. "$UTIL_VSERVER_VARS"
1435 +. "$_LIB_FUNCTIONS"
1441 +pkgInit "$vserver" rpm poldek
1443 +test -z "$_POLDEK" || {
1444 + warning $"The environment variable \$_POLDEK is not supported anymore; please use \$POLDEK instead of"
1445 + ${POLDEK:=$_POLDEK}
1448 +exec ${_POLDEK:-poldek} \
1450 + --cachedir=$POLDEKCACHEDIR \
1451 + --conf=$POLDEK_CONFIG \
1452 + --pmcmd=$RPM_BINARY \
1454 diff -urN util-vserver-0.30.212.org/scripts/vserver-build util-vserver-0.30.212/scripts/vserver-build
1455 --- util-vserver-0.30.212.org/scripts/vserver-build 2006-12-09 17:15:24.000000000 +0100
1456 +++ util-vserver-0.30.212/scripts/vserver-build 2007-02-04 18:20:38.673246000 +0100
1458 yum ... -- -d <distribution>
1459 ... installs the base-packages of the given distribution with
1461 + poldek ... -- -d <distribution>
1462 + ... installs the base-packages of the given distribution with
1464 rpm ... -- [-d <distribution>] --empty|([--force] [--nodeps] <manifest>)+
1465 ... installs lists of rpm-packages
1466 skeleton ... -- [<cmd> <args>*]
1470 (xlegacy) exec $_VSERVER_LEGACY "$VSERVER_NAME" build "$@" ;;
1471 - (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync)
1472 + (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xpoldek)
1473 . $__PKGLIBDIR/vserver-build.$method
1475 (x) panic $"No build-method specified";;
1476 diff -urN util-vserver-0.30.212.org/scripts/vserver-build.functions util-vserver-0.30.212/scripts/vserver-build.functions
1477 --- util-vserver-0.30.212.org/scripts/vserver-build.functions 2006-12-09 17:15:24.000000000 +0100
1478 +++ util-vserver-0.30.212/scripts/vserver-build.functions 2007-02-04 18:20:38.673246000 +0100
1479 @@ -167,6 +167,12 @@
1480 elif test -e /etc/slackware-version; then
1481 set -- $(cat /etc/slackware-version)
1482 DISTRIBUTION=slackware$2
1483 + elif test -e /etc/pld-release; then
1486 + set -- $(cat /etc/pld-release)
1487 + DISTRIBUTION=pld-$(echo $2 | tr A-Z a-z)
1489 elif test -n "$1"; then
1492 diff -urN util-vserver-0.30.212.org/scripts/vserver-build.functions.poldek util-vserver-0.30.212/scripts/vserver-build.functions.poldek
1493 --- util-vserver-0.30.212.org/scripts/vserver-build.functions.poldek 1970-01-01 01:00:00.000000000 +0100
1494 +++ util-vserver-0.30.212/scripts/vserver-build.functions.poldek 2007-02-04 18:20:38.673246000 +0100
1496 +# $Id$ --*- sh -*--
1498 +# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
1500 +# This program is free software; you can redistribute it and/or modify
1501 +# it under the terms of the GNU General Public License as published by
1502 +# the Free Software Foundation; version 2 of the License.
1504 +# This program is distributed in the hope that it will be useful,
1505 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1506 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1507 +# GNU General Public License for more details.
1509 +# You should have received a copy of the GNU General Public License
1510 +# along with this program; if not, write to the Free Software
1511 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1513 +function poldek.installBasePackages
1518 + test "$dir" != / || return 0
1519 + for filelist in "$dir"/*; do
1520 + isRegularFile "$filelist" || continue
1522 + local can_fail=false
1523 + local flags='--install'
1525 + set -- $(<$filelist)
1526 + while test "$#" -gt 0; do
1528 + --reinstall) flags='--reinstall';;
1529 + --can-fail) can_fail=true;;
1534 + "$_VPOLDEK" "$name" -- $flags $* || $can_fail
1538 +function poldek.initVariables
1540 + findFile POLDEKCONFDEFAULT \
1541 + "$__CONFDIR/.distributions/$DISTRIBUTION/poldek/poldek.conf" \
1542 + "$__CONFDIR/.defaults/apps/pkgmgmt/poldek/poldek.conf" \
1543 + "$__DISTRIBDIR/$DISTRIBUTION/poldek/poldek.conf" \
1544 + "$__DISTRIBDIR/defaults/poldek/poldek.conf" \
1548 +function poldek.initFilesystem
1550 + mkdir -p "$PKGCFGDIR"/poldek/etc
1551 + mkdir -p "$PKGCFGBASE"/poldek-cache
1553 + $_LN_S "$PKGCFGBASE"/poldek-cache "$PKGCFGDIR"/poldek/cache
1555 + populateDirectory "$PKGCFGDIR/poldek/etc" \
1556 + "$__DISTRIBDIR/defaults/poldek" \
1557 + "$__DISTRIBDIR/$DISTRIBUTION/poldek" \
1558 + "$__CONFDIR/.distributions/$DISTRIBUTION/poldek"
1560 +# test -z "$POLDEKCONFDEFAULT" || \
1561 +# $_LN_S "$POLDEKCONFDEFAULT" "$PKGCFGDIR"/poldek/etc/
1563 diff -urN util-vserver-0.30.212.org/scripts/vserver-build.poldek util-vserver-0.30.212/scripts/vserver-build.poldek
1564 --- util-vserver-0.30.212.org/scripts/vserver-build.poldek 1970-01-01 01:00:00.000000000 +0100
1565 +++ util-vserver-0.30.212/scripts/vserver-build.poldek 2007-02-04 18:20:38.701247750 +0100
1567 +# $Id$ --*- sh -*--
1569 +# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
1571 +# This program is free software; you can redistribute it and/or modify
1572 +# it under the terms of the GNU General Public License as published by
1573 +# the Free Software Foundation; version 2 of the License.
1575 +# This program is distributed in the hope that it will be useful,
1576 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1577 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1578 +# GNU General Public License for more details.
1580 +# You should have received a copy of the GNU General Public License
1581 +# along with this program; if not, write to the Free Software
1582 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1584 +tmp=$(getopt -o +d: --long debug -n "$0" -- "$@") || exit 1
1587 +. "$_LIB_VSERVER_BUILD_FUNCTIONS_RPM"
1588 +. "$_LIB_VSERVER_BUILD_FUNCTIONS_POLDEK"
1589 +. "$_LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT"
1593 + (-d) DISTRIBUTION=$2; shift;;
1594 + (--debug) set -x;;
1595 + (--) shift; break ;;
1596 + (*) echo "vserver-build.poldek: internal error: unrecognized option '$1'" >&2
1607 +pkgmgmt.initVariables
1609 +poldek.initVariables
1611 +base.initFilesystem "$OPTION_FORCE"
1612 +pkgmgmt.initFilesystem "$OPTION_FORCE"
1614 +poldek.initFilesystem
1616 +setup_writeOption "$VSERVER_NAME"
1617 +setup_writeInitialFstab
1619 +test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"
1620 +rpm.initDB "$SETUP_CONFDIR"
1621 +rpm.importGPGPubKeys "$SETUP_CONFDIR" \
1622 + "$__CONFDIR/.distributions/$DISTRIBUTION/pubkeys" \
1623 + "$__CONFDIR/.distributions/.common/pubkeys" \
1624 + "$__DISTRIBDIR/$DISTRIBUTION/pubkeys"
1626 +$_VPOLDEK "$SETUP_CONFDIR" -- --update-whole
1627 +poldek.installBasePackages "$SETUP_CONFDIR" "$PKGINSTALLDIR"
1628 +test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"