1 --- util-vserver-0.30.214/distrib/Makefile.am 2008-03-25 22:59:35.515771366 +0200
2 +++ util-vserver-0.30.214/distrib/Makefile.am 2008-03-25 23:22:53.714374272 +0200
6 defaults/apt/apt.conf \
7 + defaults/poldek/poldek.conf \
8 template/initpost template/initpre \
9 rh9/apt/rpmpriorities rh9/pkgs/01 rh9/pkgs/02 \
10 fc1/apt/rpmpriorities fc1/pkgs/01 fc1/pkgs/02 \
12 breezy/debootstrap.script dapper/debootstrap.script \
13 edgy/debootstrap.script feisty/debootstrap.script \
14 gutsy/debootstrap.script hoary/debootstrap.script \
15 - warty/debootstrap.script
16 + warty/debootstrap.script \
17 + pld-ac/pkgs/01 pld-ac/rpm/macros \
18 + pld-th/pkgs/01 pld-th/rpm/macros \
19 + pld-ti/pkgs/01 pld-ti/rpm/macros
21 nobase_confdistrib_DATA = rh9/apt/sources.list \
22 fc1/apt/sources.list \
24 fc5/apt/sources.list \
25 fc6/apt/sources.list \
27 - suse91/apt/sources.list
28 + suse91/apt/sources.list \
29 + pld-ac/poldek/repos.d/pld.conf \
30 + pld-th/poldek/repos.d/pld.conf \
31 + pld-ti/poldek/repos.d/pld.conf
33 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT \
34 = $(nobase_distrib_SCRIPTS)
35 --- /dev/null 2007-11-07 17:05:30.000000000 +0200
36 +++ util-vserver-0.30.214/distrib/defaults/poldek/poldek.conf 2008-03-25 19:36:58.721331962 +0200
38 +# poldek configuration file.
43 +particle install = no
44 +choose equivalents manually = yes
45 +unique package names = yes
48 +ignore = kernel* udev devfs
49 --- util-vserver-0.30.214/distrib/pld-ac/pkgs/01 2007-11-15 23:20:48.181172125 +0100
50 +++ util-vserver-0.30.214/distrib/pld-ac/pkgs/01 2008-03-25 23:05:18.538916218 +0200
58 --- util-vserver-0.30.214/distrib/pld-ac/poldek/repos.d/pld.conf 2007-11-15 23:20:48.181172125 +0100
59 +++ util-vserver-0.30.214/distrib/pld-ac/poldek/repos.d/pld.conf 2008-03-25 20:34:12.000000000 +0200
62 +# PLD Linux Distribution <http://www.pld-linux.org/>.
64 +# specify our packages architecture
67 +# main PLD-site for often changed things:
68 +_pld_main_prefix = ftp://ftp.ac.pld-linux.org/dists/ac
71 +## You can use them if you have better connection there
73 +#_prefix = ftp://ftp.task.pld-linux.org/dists/ac
74 +#_prefix = %{_pld_main_prefix}
75 +_prefix = %{_pld_main_prefix}
83 +path = %{_prefix}/PLD/%{_arch}/PLD/RPMS/
85 +# buggy deps -- use one from updates instead
86 +ignore = msmtp-sendmail*
92 +path = %{_prefix}/updates/%{_arch}/
99 +path = %{_prefix}/supported/%{_arch}/
107 +path = %{_pld_main_prefix}/ready/%{_arch}/
114 +path = %{_pld_main_prefix}/test/%{_arch}/
117 --- util-vserver-0.30.214.org/distrib/pld-ac/rpm/macros 1970-01-01 01:00:00.000000000 +0100
118 +++ util-vserver-0.30.214/distrib/pld-ac/rpm/macros 2007-11-15 23:20:48.181172125 +0100
120 +# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
121 +# you have to use at least one language beside 'C'
122 +%_install_langs C:en:pl
123 +%_netsharedpath /dev
124 --- util-vserver-0.30.214/distrib/pld-th/pkgs/01 2007-11-15 23:20:48.181172125 +0100
125 +++ util-vserver-0.30.214/distrib/pld-th/pkgs/01 2008-03-25 23:05:18.538916218 +0200
133 --- util-vserver-0.30.214/distrib/pld-th/poldek/repos.d/pld.conf 2007-11-15 23:20:48.181172125 +0100
134 +++ util-vserver-0.30.214/distrib/pld-th/poldek/repos.d/pld.conf 2008-03-26 00:27:05.335185240 +0200
136 +# PLD Linux Distribution <http://www.pld-linux.org/>.
139 +_prefix = ftp://ftp.th.pld-linux.org/dists/th
141 +## You can use them if you have better connection there
143 +#_prefix = ftp://ftp.task.pld-linux.org/dists/th
151 +path = %{_prefix}/PLD/%{_arch}/RPMS/
156 +path = %{_prefix}/PLD/noarch/RPMS/
161 +#path = %{_prefix}/updates/%{_arch}/RPMS/
166 +#path = %{_prefix}/updates/noarch/RPMS/
170 +#name = th-supported
171 +#path = %{_prefix}/supported/%{_arch}/
177 +path = %{_prefix}/ready/%{_arch}/RPMS/
184 +path = %{_prefix}/ready/noarch/RPMS/
191 +path = %{_prefix}/test/%{_arch}/RPMS/
198 +path = %{_prefix}/test/noarch/RPMS/
201 --- util-vserver-0.30.214.org/distrib/pld-th/rpm/macros 1970-01-01 01:00:00.000000000 +0100
202 +++ util-vserver-0.30.214/distrib/pld-th/rpm/macros 2007-11-15 23:20:48.184505622 +0100
204 +# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
205 +# you have to use at least one language beside 'C'
206 +%_install_langs C:en:pl
207 +%_netsharedpath /dev
208 --- util-vserver-0.30.214/distrib/pld-ti/pkgs/01 2007-11-15 23:20:48.181172125 +0100
209 +++ util-vserver-0.30.214/distrib/pld-ti/pkgs/01 2008-03-25 23:05:18.538916218 +0200
217 --- util-vserver-0.30.214.org/distrib/pld-ti/poldek/repos.d/pld.conf 1970-01-01 01:00:00.000000000 +0100
218 +++ util-vserver-0.30.214/distrib/pld-ti/poldek/repos.d/pld.conf 2007-11-15 23:20:48.217840583 +0100
221 +# Unofficial version of PLD Linux Distribution
222 +# http://www.pld-linux.org/Titanium
225 +_prefix = ftp://ftp.titanium.pld-linux.org/branches/titanium
232 +path = %{_prefix}/PLD/%{_arch}/RPMS/
237 +path = %{_prefix}/PLD/noarch/RPMS/
241 +name = titanium-ready
242 +path = %{_prefix}/ready/%{_arch}/RPMS/
248 +name = titanium-ready
249 +path = %{_prefix}/ready/noarch/RPMS/
255 +name = titanium-test
256 +path = %{_prefix}/test/%{_arch}/RPMS/
262 +name = titanium-test
263 +path = %{_prefix}/test/noarch/RPMS/
266 --- util-vserver-0.30.214.org/distrib/pld-ti/rpm/macros 1970-01-01 01:00:00.000000000 +0100
267 +++ util-vserver-0.30.214/distrib/pld-ti/rpm/macros 2007-11-15 23:20:48.221174080 +0100
269 +# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
270 +# you have to use at least one language beside 'C'
271 +%_install_langs C:en:pl
272 +%_netsharedpath /dev
273 --- util-vserver-0.30.214.org/scripts/functions 2007-09-02 22:06:41.000000000 +0200
274 +++ util-vserver-0.30.214/scripts/functions 2007-11-15 23:20:48.221174080 +0100
279 +function _pkgSetVarsPoldek
281 + if test -n "$PKGDIR"; then
282 + findDir POLDEKETCDIR $PKGDIR/poldeketc $PKGDIR/base/poldek/etc /etc/poldek
283 + findDir POLDEKCACHEDIR $PKGDIR/poldek-cache $PKGDIR/base/poldek/cache
285 + findDir POLDEKETCDIR "$VDIR"/etc/poldek /etc/poldek
286 + findDir POLDEKCACHEDIR "$VDIR"/var/tmp/poldek-cache
289 + findFile POLDEK_CONFIG "$POLDEKETCDIR"/poldek.conf ""
290 + test -z "$POLDEK_CONFIG" || export POLDEK_CONFIG
294 function _pkgMountBase
297 rpm) _pkgSetVarsRPM;;
298 apt) _pkgSetVarsApt;;
299 yum) _pkgSetVarsYum;;
300 + poldek) _pkgSetVarsPoldek;;
301 *) echo "Unknown packaging flavor" >&2; exit 1;;
306 elif test -e "$_pgs_vdir"/etc/mandrake-release; then
308 + elif test -e "$_pgs_vdir"/etc/pld-release; then
310 elif test -e "$_pgs_vdir"/etc/debian_version; then
312 elif test -e "$_pgs_vdir"/etc/SuSE-release; then
314 test -n "$have_yum" && return 0 || return 1
317 +## Usage: pkgmgmt.isPoldekAvailable <cfgdir> <vdir> [<is-internal>]
318 +function pkgmgmt.isPoldekAvailable
322 + local is_internal="$3"
324 + local have_poldek i
325 + if test -n "$is_internal"; then
327 + test -d "$cfgdir"/base/poldek -o -d "$cfgdir"/poldeketc || have_poldek=
330 + for i in /bin /usr/bin /usr/local/bin; do
331 + test ! -x "$vdir$i"/poldek || { have_poldek=1; break; }
335 + test -n "$have_poldek" && return 0 || return 1
339 function vshelper.doSanityCheck
341 --- util-vserver-0.30.214.org/scripts/Makefile-files 2007-09-02 22:06:41.000000000 +0200
342 +++ util-vserver-0.30.214/scripts/Makefile-files 2007-11-15 23:20:48.221174080 +0100
344 scripts/vapt-get-worker \
345 scripts/vrpm-worker \
346 scripts/vyum-worker \
347 + scripts/vpoldek-worker \
348 scripts/vrpm-preload \
349 scripts/save_s_context \
350 scripts/vservers.grabinfo.sh \
352 scripts/vserver-build.template \
353 scripts/vserver-build.rsync \
354 scripts/vserver-build.clone \
355 + scripts/vserver-build.poldek \
356 scripts/vserver-build.functions \
357 scripts/vserver-build.functions.apt \
358 scripts/vserver-build.functions.rpm \
359 scripts/vserver-build.functions.pkgmgmt \
360 scripts/vserver-build.functions.yum \
361 + scripts/vserver-build.functions.poldek \
362 scripts/vserver-setup.functions \
363 scripts/vserver.functions \
364 scripts/vserver.start \
366 scripts_pkglib_src_SCRPTS = scripts/pkgmgmt \
367 scripts/vapt-get-worker \
369 + scripts/vpoldek-worker \
370 scripts/vrpm-worker \
371 scripts/vrpm-preload \
372 scripts/start-vservers \
374 scripts_sbin_src_PRGS = scripts/chbind \
378 scripts/vdispatch-conf \
381 --- util-vserver-0.30.214.org/scripts/pkgmgmt 2007-09-02 22:06:41.000000000 +0200
382 +++ util-vserver-0.30.214/scripts/pkgmgmt 2007-11-15 23:20:48.221174080 +0100
387 - (RH) pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum "${YUM_RELEASEPKGS[@]}")
388 + (RH) pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum poldek "${YUM_RELEASEPKGS[@]}")
389 hasSubstring "$pkgs" ---rpm--- || {
391 * The vserver does not seem to have the 'rpm' package which is required
396 - hasSubstring "$pkgs" ---apt--- ---yum--- || {
397 + hasSubstring "$pkgs" ---apt--- ---yum--- ---poldek--- || {
399 -* The vserver does not seem to have a depsolver like 'apt' or 'yum'
400 +* The vserver does not seem to have a depsolver like 'apt', 'yum' or 'poldek'
401 installed. It is suggested to install such a program before setting
402 up internal package management."
404 @@ -368,6 +368,131 @@
408 +function processVserver_PLD()
411 + local is_internalize=$2
415 + cfgdir=$($_VSERVER_INFO "$vserver" APPDIR pkgmgmt) || \
416 + cfgdir=$($_VSERVER_INFO "$vserver" APPDIR)/pkgmgmt
418 + ## Figure out the environment....
419 + pkgmgmt.isPoldekAvailable "$cfgdir" "$vdir" "$is_internalize" || have_poldek=
421 + local POLDEKETCDIR=
422 + local POLDEKCACHEDIR=
426 + ## Create directories and assign variables where configuration
427 + ## can/will be found on the host
428 + if test -n "$is_internalize"; then
429 + verifyInternalPackages "$vserver" RH || test -n "$IS_FORCE" ||
431 +Can not continue; use '--force' to override this check"
433 + pushd "$vdir" >/dev/null
435 + test ! -L var/lib/rpm || {
436 + $_EXEC_CD /var/lib $_RM rpm &&
437 + $_EXEC_CD /var/lib $_MKDIR -m755 rpm &&
438 + $_EXEC_CD /var/lib $_CHOWN rpm:rpm rpm ||
440 + } </dev/null 2>/dev/null
442 + for i in var/tmp/poldek-cache etc/rpm etc/poldek; do
444 + $_EXEC_CD /$(dirname "$i") $_MKDIR -m755 $(basename "$i") || :
449 + if test -n "$have_poldek"; then
450 + findDir POLDEKETCDIR "$cfgdir"/poldeketc "$cfgdir"/base/poldek/etc /etc/poldek
453 + findDir RPMETCDIR "$cfgdir"/rpmetc "$cfgdir"/base/rpm/etc /etc/rpm /
454 + findDir RPMSTATEDIR "$cfgdir"/rpmstate "$cfgdir"/base/rpm/state
456 + mkdir -m755 -p "$cfgdir"
459 + if test -n "$have_poldek"; then
460 + findDir POLDEKETCDIR "$cfgdir"/poldeketc "$cfgdir"/base/poldek/etc /
461 + findDir POLDEKCACHEDIR "$cfgdir"/poldek-cache "$cfgdir"/base/poldek/cache /
463 + test "$POLDEKETCDIR" != / || POLDEKETCDIR=$cfgdir/base/poldek/etc
464 + test "$POLDEKCACHEDIR" != / || POLDEKCACHEDIR=$cfgdir/base/poldek/cache
466 + test -d "$cfgdir"/poldeketc -a -d "$cfgdir"/poldek-cache || need_base=1
469 + findDir RPMETCDIR "$cfgdir"/rpmetc "$cfgdir"/base/rpm/etc /
470 + findDir RPMSTATEDIR "$cfgdir"/rpmstate "$cfgdir"/base/rpm/state /
472 + test "$RPMETCDIR" != / || RPMETCDIR=$cfgdir/base/rpm/etc
473 + test "$RPMSTATEDIR" != / || RPMSTATEDIR=$cfgdir/base/rpm/state
475 + test -d "$cfgdir"/rpmetc -a -d "$cfgdir"/rpmstate || need_base=1
476 + test ! -e "$cfgdir"/base || need_base=
478 + test -z "$need_base" || ln -s "$PKGCFGDIR" "$cfgdir"/base
480 + mkdir -m755 -p "$PKGCFGDIR"
481 + _createDirs "$POLDEKETCDIR" "$POLDEKCACHEDIR" \
482 + "$RPMETCDIR" "$RPMSTATEDIR"
485 + ## Copy the files...
486 + if test -n "$is_internalize"; then
487 + if test -n "$have_poldek"; then
488 + _copySecure "$vdir" "$POLDEKETCDIR" /etc/poldek
489 + pushd "$vdir" >/dev/null
490 + _hashAuto /etc/poldek.conf '/'
494 + _copySecure "$vdir" "$RPMETCDIR" /etc/rpm
495 + _copySecure "$vdir" "$RPMSTATEDIR" /var/lib/rpm
497 + pushd "$vdir" >/dev/null
498 + ## remove %_dbpath settings
499 + _substFile /etc/rpm/macros '/^%_dbpath[ \t].*/D'
502 + if test -n "$have_poldek"; then
503 + _copySecureRev "$vdir" /etc/poldek "$POLDEKETCDIR"
504 + _unhashAuto "$POLDEKETCDIR"/poldek.conf '/'
507 + _copySecureRev "$vdir" /etc/rpm "$RPMETCDIR"
508 + _copySecureRev "$vdir" /var/lib/rpm "$RPMSTATEDIR"
510 + echo -e "%_dbpath\t\t$rpmdb_mntpoint" >>$RPMETCDIR/macros
514 + if test -n "$is_internalize"; then
517 + tmpdir=$($_MKTEMPDIR -p /var/tmp pgmgmt.XXXXXX)
518 + trap "$_RM -rf $tmpdir" EXIT
519 + pushd "$vdir" >/dev/null
520 + $_EXEC_CD /var/lib $_MV rpm $tmpdir/
521 + $_EXEC_CD /var/lib $_LN_S "$rpmdb_mntpoint" rpm
526 + if test -n "$is_internalize"; then
527 + $_TOUCH "$cfgdir"/internal
529 + $_RM -f "$cfgdir"/internal
533 function processVserver_Debian()
539 (redhat|mandrake) processVserver_RH "$vserver" "$IS_INTERNALIZE";;
540 + (pld) processVserver_PLD "$vserver" "$IS_INTERNALIZE";;
541 (debian) processVserver_Debian "$vserver" "$IS_INTERNALIZE";;
543 echo $"Vserver style '$style' is not supported for packagemanagment" >&2
544 --- util-vserver-0.30.214.org/scripts/util-vserver-vars.pathsubst 2007-09-02 22:06:41.000000000 +0200
545 +++ util-vserver-0.30.214/scripts/util-vserver-vars.pathsubst 2007-11-15 23:20:48.221174080 +0100
547 _LIB_VSERVER_BUILD_FUNCTIONS_RPM="$__PKGLIBDIR/vserver-build.functions.rpm"
548 _LIB_VSERVER_BUILD_FUNCTIONS_YUM="$__PKGLIBDIR/vserver-build.functions.yum"
549 _LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT="$__PKGLIBDIR/vserver-build.functions.pkgmgmt"
550 +_LIB_VSERVER_BUILD_FUNCTIONS_POLDEK="$__PKGLIBDIR/vserver-build.functions.poldek"
551 _LISTDEVIP="$__LEGACYDIR/listdevip"
552 _LOCKFILE="$__PKGLIBDIR/lockfile"
553 _MASK2PREFIX="$__PKGLIBDIR/mask2prefix"
555 _VUNIFY="$__PKGLIBDIR/vunify"
556 _VYUM="$__SBINDIR/vyum"
557 _VYUM_WORKER="$__PKGLIBDIR/vyum-worker"
558 +_VPOLDEK="$__SBINDIR/vpoldek"
559 +_VPOLDEK_WORKER="$__PKGLIBDIR/vpoldek-worker"
563 --- util-vserver-0.30.214.org/scripts/vpkg 2007-09-02 22:06:41.000000000 +0200
564 +++ util-vserver-0.30.214/scripts/vpkg 2007-11-15 23:20:48.221174080 +0100
573 + ## rpm outputs sometimes '(contains no files)', so return
574 + ## only the valid output
576 + rpm_param=( -qac --pipe "$_SED '\!^/!p;d'" );;
578 + rpm_param=( -Uvh "$@" )
579 + poldek_param=( --install -v "$@" )
583 + if test -n "$is_external"; then
585 + test -d "$cfgdir"/base/poldek -o -d "$cfgdir"/poldeketc || have_poldek=
588 + for i in /bin /usr/bin /usr/local/bin; do
589 + test ! -x "$vdir$i"/poldek || { have_poldek=1; break; }
593 + if test -n "$is_external"; then
594 + if test "$have_poldek" -a "$poldek_param"; then
595 + cmd=( "$_VPOLDEK" "$vserver" -- "${poldek_param[@]}" )
597 + cmd=( "$_VRPM" "$vserver" -- "${rpm_param[@]}" )
600 + if test "$have_poldek" -a "$poldek_param"; then
601 + cmd=( "$_VSERVER" --silent "$vserver" exec poldek "${poldek_param[@]}" )
603 + cmd=( "$_VSERVER" --silent "$vserver" exec rpm "${rpm_param[@]}" )
610 --- util-vserver-0.30.214.org/scripts/vpoldek 1970-01-01 01:00:00.000000000 +0100
611 +++ util-vserver-0.30.214/scripts/vpoldek 2007-11-15 22:00:24.000000000 +0100
616 +# Copyright (C) 2007 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
618 +# This program is free software; you can redistribute it and/or modify
619 +# it under the terms of the GNU General Public License as published by
620 +# the Free Software Foundation; version 2 of the License.
622 +# This program is distributed in the hope that it will be useful,
623 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
624 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
625 +# GNU General Public License for more details.
627 +# You should have received a copy of the GNU General Public License
628 +# along with this program; if not, write to the Free Software
629 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
631 +: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
632 +test -e "$UTIL_VSERVER_VARS" || {
633 + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
636 +. "$UTIL_VSERVER_VARS"
643 +$"Usage: $0 <vserver-name>* [--all] -- <params>+
645 +Report bugs to <$PACKAGE_BUGREPORT>."
649 +function showVersion()
652 +$"vpoldek $PACKAGE_VERSION -- poldek for vservers
653 +This program is part of $PACKAGE_STRING
655 +Copyright (C) 2007 Enrico Scholz
656 +This program is free software; you may redistribute it under the terms of
657 +the GNU General Public License. This program has absolutely no warranty."
661 +tmp=$(getopt -o +q --long help,version,debug,quiet,all -n "$0" -- "$@") || exit 1
664 +declare -a send_through poldek_opts
668 + (--help) showHelp $0 ;;
669 + (--version) showVersion ;;
670 + (--debug) send_through=( "${send_through[@]}" "$1" ); set -x;;
671 + (--quiet|-q) send_through=( "${send_through[@]}" "$1" );;
672 + (--all) poldek_opts=( "${poldek_opts[@]}" "$1" );;
673 + (--) shift; break;;
674 + (*) echo $"vpoldek: internal error; arg=='$1'" >&2; exit 1;;
679 +VSOMETHING_TITLE=vpoldek
680 +VSOMETHING_WORKER=$_VPOLDEK_WORKER
681 +VSOMETHING_PKGMGMT=1
683 +export VSOMETHING_TITLE VSOMETHING_WORKER VSOMETHING_PKGMGMT
685 +test ${#poldek_opts[@]} -eq 0 || poldek_opts=( "${poldek_opts[@]}" -- )
686 +exec $_VSOMETHING "${send_through[@]}" poldek "${poldek_opts[@]}" "$@"
687 --- util-vserver-0.30.214.org/scripts/vpoldek-worker 1970-01-01 01:00:00.000000000 +0100
688 +++ util-vserver-0.30.214/scripts/vpoldek-worker 2007-11-15 22:58:23.000000000 +0100
693 +# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
695 +# This program is free software; you can redistribute it and/or modify
696 +# it under the terms of the GNU General Public License as published by
697 +# the Free Software Foundation; version 2 of the License.
699 +# This program is distributed in the hope that it will be useful,
700 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
701 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
702 +# GNU General Public License for more details.
704 +# You should have received a copy of the GNU General Public License
705 +# along with this program; if not, write to the Free Software
706 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
710 +: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
711 +test -e "$UTIL_VSERVER_VARS" || {
712 + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
715 +. "$UTIL_VSERVER_VARS"
722 +pkgInit "$vserver" rpm poldek
724 +test -z "$_POLDEK" || {
725 + warning $"The environment variable \$_POLDEK is not supported anymore; please use \$POLDEK instead of"
726 + ${POLDEK:=$_POLDEK}
729 +exec ${_POLDEK:-poldek} \
731 + --cachedir=$POLDEKCACHEDIR \
732 + --conf=$POLDEK_CONFIG \
733 + --pmcmd=$RPM_BINARY \
735 --- util-vserver-0.30.214.org/scripts/vserver-build 2007-09-02 22:06:41.000000000 +0200
736 +++ util-vserver-0.30.214/scripts/vserver-build 2007-11-15 23:20:48.224507577 +0100
738 yum ... -- -d <distribution>
739 ... installs the base-packages of the given distribution with
741 + poldek ... -- -d <distribution>
742 + ... installs the base-packages of the given distribution with
744 rpm ... -- [-d <distribution>] --empty|([--force] [--nodeps] <manifest>)+
745 ... installs lists of rpm-packages
746 skeleton ... -- [<cmd> <args>*]
750 (xlegacy) exec $_VSERVER_LEGACY "$VSERVER_NAME" build "$@" ;;
751 - (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone)
752 + (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone|xpoldek)
753 . $__PKGLIBDIR/vserver-build.$method
755 (x) panic $"No build-method specified";;
756 --- util-vserver-0.30.214.org/scripts/vserver-build.functions 2007-09-02 22:06:41.000000000 +0200
757 +++ util-vserver-0.30.214/scripts/vserver-build.functions 2007-11-15 23:20:48.224507577 +0100
759 elif test -e /etc/slackware-version; then
760 set -- $(cat /etc/slackware-version)
761 DISTRIBUTION=slackware$2
762 + elif test -e /etc/pld-release; then
765 + set -- $(cat /etc/pld-release)
766 + DISTRIBUTION=pld-$(echo $2 | tr A-Z a-z)
768 elif test -n "$1"; then
771 --- util-vserver-0.30.214/scripts/vserver-build.functions.poldek 2008-03-25 19:20:07.685144000 +0200
772 +++ util-vserver-0.30.214/scripts/vserver-build.functions.poldek 2008-03-25 20:37:09.000000000 +0200
776 +# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
778 +# This program is free software; you can redistribute it and/or modify
779 +# it under the terms of the GNU General Public License as published by
780 +# the Free Software Foundation; version 2 of the License.
782 +# This program is distributed in the hope that it will be useful,
783 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
784 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
785 +# GNU General Public License for more details.
787 +# You should have received a copy of the GNU General Public License
788 +# along with this program; if not, write to the Free Software
789 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
791 +function poldek.installBasePackages
796 + test "$dir" != / || return 0
797 + for filelist in "$dir"/*; do
798 + isRegularFile "$filelist" || continue
800 + local can_fail=false
801 + local flags='--install'
803 + set -- $(<$filelist)
804 + while test "$#" -gt 0; do
806 + --reinstall) flags='--reinstall';;
807 + --can-fail) can_fail=true;;
812 + "$_VPOLDEK" "$name" -- $flags $* || $can_fail
816 +function poldek.initVariables
818 + findFile POLDEKCONFDEFAULT \
819 + "$__CONFDIR/.distributions/$DISTRIBUTION/poldek/poldek.conf" \
820 + "$__CONFDIR/.defaults/apps/pkgmgmt/poldek/poldek.conf" \
821 + "$__DISTRIBDIR/$DISTRIBUTION/poldek/poldek.conf" \
822 + "$__DISTRIBDIR/defaults/poldek/poldek.conf" \
826 +function poldek.initFilesystem
828 + mkdir -p "$PKGCFGDIR"/poldek/etc/repos.d
829 + mkdir -p "$PKGCFGBASE"/poldek-cache
831 + $_LN_S "$PKGCFGBASE"/poldek-cache "$PKGCFGDIR"/poldek/cache
833 + populateDirectory "$PKGCFGDIR/poldek/etc" \
834 + "$__DISTRIBDIR/defaults/poldek" \
835 + "$__DISTRIBDIR/$DISTRIBUTION/poldek" \
836 + "$__CONFDIR/.distributions/$DISTRIBUTION/poldek"
838 + populateDirectory "$PKGCFGDIR/poldek/etc/repos.d" \
839 + "$__DISTRIBDIR/defaults/poldek/repos.d" \
840 + "$__DISTRIBDIR/$DISTRIBUTION/poldek/repos.d" \
841 + "$__CONFDIR/.distributions/$DISTRIBUTION/poldek/repos.d"
843 + if [ -n "$SETUP_MACHINE" ]; then
844 + say "Using $SETUP_MACHINE as machine"
845 + sed -i -e "s#^\(_arch\s*\)=.*#\1= $SETUP_MACHINE#" "$PKGCFGDIR"/poldek/etc/repos.d/pld.conf
848 + if [ -n "$MIRROR" ]; then
849 + say "Using $MIRROR as mirror URL"
850 + sed -i -e "s#^\(_prefix\s*\)=.*#\1= $MIRROR#" "$PKGCFGDIR"/poldek/etc/repos.d/pld.conf
853 +# test -z "$POLDEKCONFDEFAULT" || \
854 +# $_LN_S "$POLDEKCONFDEFAULT" "$PKGCFGDIR"/poldek/etc/
856 --- util-vserver-0.30.214/scripts/vserver-build.poldek 2007-11-15 23:20:48.224507577 +0100
857 +++ util-vserver-0.30.214/scripts/vserver-build.poldek 2008-03-25 20:25:23.000000000 +0200
861 +# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
863 +# This program is free software; you can redistribute it and/or modify
864 +# it under the terms of the GNU General Public License as published by
865 +# the Free Software Foundation; version 2 of the License.
867 +# This program is distributed in the hope that it will be useful,
868 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
869 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
870 +# GNU General Public License for more details.
872 +# You should have received a copy of the GNU General Public License
873 +# along with this program; if not, write to the Free Software
874 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
876 +tmp=$(getopt -o +d:,m: --long debug -n "$0" -- "$@") || exit 1
879 +. "$_LIB_VSERVER_BUILD_FUNCTIONS_RPM"
880 +. "$_LIB_VSERVER_BUILD_FUNCTIONS_POLDEK"
881 +. "$_LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT"
885 + (-d) DISTRIBUTION=$2; shift;;
886 + (-m) MIRROR=$2; shift;;
888 + (--) shift; break ;;
889 + (*) echo "vserver-build.poldek: internal error: unrecognized option '$1'" >&2
900 +pkgmgmt.initVariables
902 +poldek.initVariables
904 +base.initFilesystem "$OPTION_FORCE"
905 +pkgmgmt.initFilesystem "$OPTION_FORCE"
907 +poldek.initFilesystem
909 +setup_writeOption "$VSERVER_NAME"
910 +setup_writeInitialFstab
912 +test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"
913 +rpm.initDB "$SETUP_CONFDIR"
914 +rpm.importGPGPubKeys "$SETUP_CONFDIR" \
915 + "$__CONFDIR/.distributions/$DISTRIBUTION/pubkeys" \
916 + "$__CONFDIR/.distributions/.common/pubkeys" \
917 + "$__DISTRIBDIR/$DISTRIBUTION/pubkeys"
919 +$_VPOLDEK "$SETUP_CONFDIR" -- --update-whole
920 +poldek.installBasePackages "$SETUP_CONFDIR" "$PKGINSTALLDIR"
921 +test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"