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/distrib/pld-ac/rpm/macros 2007-11-15 23:20:48.181172125 +0100
118 +++ util-vserver-0.30.214/distrib/pld-ac/rpm/macros 2008-04-29 23:36:23.674175489 +0300
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
125 --- util-vserver-0.30.214/distrib/pld-th/pkgs/01 2007-11-15 23:20:48.181172125 +0100
126 +++ util-vserver-0.30.214/distrib/pld-th/pkgs/01 2008-03-25 23:05:18.538916218 +0200
134 --- util-vserver-0.30.214/distrib/pld-th/poldek/repos.d/pld.conf 2007-11-15 23:20:48.181172125 +0100
135 +++ util-vserver-0.30.214/distrib/pld-th/poldek/repos.d/pld.conf 2008-03-26 00:27:05.335185240 +0200
137 +# PLD Linux Distribution <http://www.pld-linux.org/>.
140 +_prefix = ftp://ftp.th.pld-linux.org/dists/th
142 +## You can use them if you have better connection there
144 +#_prefix = ftp://ftp.task.pld-linux.org/dists/th
152 +path = %{_prefix}/PLD/%{_arch}/RPMS/
157 +path = %{_prefix}/PLD/noarch/RPMS/
162 +#path = %{_prefix}/updates/%{_arch}/RPMS/
167 +#path = %{_prefix}/updates/noarch/RPMS/
171 +#name = th-supported
172 +#path = %{_prefix}/supported/%{_arch}/
178 +path = %{_prefix}/ready/%{_arch}/RPMS/
185 +path = %{_prefix}/ready/noarch/RPMS/
192 +path = %{_prefix}/test/%{_arch}/RPMS/
199 +path = %{_prefix}/test/noarch/RPMS/
202 --- util-vserver-0.30.214.org/distrib/pld-th/rpm/macros 1970-01-01 01:00:00.000000000 +0100
203 +++ util-vserver-0.30.214/distrib/pld-th/rpm/macros 2007-11-15 23:20:48.184505622 +0100
205 +# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
206 +# you have to use at least one language beside 'C'
207 +%_install_langs C:en:pl
208 +%_netsharedpath /dev
210 --- util-vserver-0.30.214/distrib/pld-ti/pkgs/01 2007-11-15 23:20:48.181172125 +0100
211 +++ util-vserver-0.30.214/distrib/pld-ti/pkgs/01 2008-03-25 23:05:18.538916218 +0200
219 --- util-vserver-0.30.214.org/distrib/pld-ti/poldek/repos.d/pld.conf 1970-01-01 01:00:00.000000000 +0100
220 +++ util-vserver-0.30.214/distrib/pld-ti/poldek/repos.d/pld.conf 2007-11-15 23:20:48.217840583 +0100
223 +# Unofficial version of PLD Linux Distribution
224 +# http://www.pld-linux.org/Titanium
227 +_prefix = ftp://ftp.titanium.pld-linux.org/branches/titanium
234 +path = %{_prefix}/PLD/%{_arch}/RPMS/
239 +path = %{_prefix}/PLD/noarch/RPMS/
243 +name = titanium-ready
244 +path = %{_prefix}/ready/%{_arch}/RPMS/
250 +name = titanium-ready
251 +path = %{_prefix}/ready/noarch/RPMS/
257 +name = titanium-test
258 +path = %{_prefix}/test/%{_arch}/RPMS/
264 +name = titanium-test
265 +path = %{_prefix}/test/noarch/RPMS/
268 --- util-vserver-0.30.214.org/distrib/pld-ti/rpm/macros 1970-01-01 01:00:00.000000000 +0100
269 +++ util-vserver-0.30.214/distrib/pld-ti/rpm/macros 2007-11-15 23:20:48.221174080 +0100
271 +# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
272 +# you have to use at least one language beside 'C'
273 +%_install_langs C:en:pl
274 +%_netsharedpath /dev
276 --- util-vserver-0.30.214.org/scripts/functions 2007-09-02 22:06:41.000000000 +0200
277 +++ util-vserver-0.30.214/scripts/functions 2007-11-15 23:20:48.221174080 +0100
282 +function _pkgSetVarsPoldek
284 + if test -n "$PKGDIR"; then
285 + findDir POLDEKETCDIR $PKGDIR/poldeketc $PKGDIR/base/poldek/etc /etc/poldek
286 + findDir POLDEKCACHEDIR $PKGDIR/poldek-cache $PKGDIR/base/poldek/cache
288 + findDir POLDEKETCDIR "$VDIR"/etc/poldek /etc/poldek
289 + findDir POLDEKCACHEDIR "$VDIR"/var/tmp/poldek-cache
292 + findFile POLDEK_CONFIG "$POLDEKETCDIR"/poldek.conf ""
293 + test -z "$POLDEK_CONFIG" || export POLDEK_CONFIG
297 function _pkgMountBase
300 rpm) _pkgSetVarsRPM;;
301 apt) _pkgSetVarsApt;;
302 yum) _pkgSetVarsYum;;
303 + poldek) _pkgSetVarsPoldek;;
304 *) echo "Unknown packaging flavor" >&2; exit 1;;
309 elif test -e "$_pgs_vdir"/etc/mandrake-release; then
311 + elif test -e "$_pgs_vdir"/etc/pld-release; then
313 elif test -e "$_pgs_vdir"/etc/debian_version; then
315 elif test -e "$_pgs_vdir"/etc/SuSE-release; then
317 test -n "$have_yum" && return 0 || return 1
320 +## Usage: pkgmgmt.isPoldekAvailable <cfgdir> <vdir> [<is-internal>]
321 +function pkgmgmt.isPoldekAvailable
325 + local is_internal="$3"
327 + local have_poldek i
328 + if test -n "$is_internal"; then
330 + test -d "$cfgdir"/base/poldek -o -d "$cfgdir"/poldeketc || have_poldek=
333 + for i in /bin /usr/bin /usr/local/bin; do
334 + test ! -x "$vdir$i"/poldek || { have_poldek=1; break; }
338 + test -n "$have_poldek" && return 0 || return 1
342 function vshelper.doSanityCheck
344 --- util-vserver-0.30.214.org/scripts/Makefile-files 2007-09-02 22:06:41.000000000 +0200
345 +++ util-vserver-0.30.214/scripts/Makefile-files 2007-11-15 23:20:48.221174080 +0100
347 scripts/vapt-get-worker \
348 scripts/vrpm-worker \
349 scripts/vyum-worker \
350 + scripts/vpoldek-worker \
351 scripts/vrpm-preload \
352 scripts/save_s_context \
353 scripts/vservers.grabinfo.sh \
355 scripts/vserver-build.template \
356 scripts/vserver-build.rsync \
357 scripts/vserver-build.clone \
358 + scripts/vserver-build.poldek \
359 scripts/vserver-build.functions \
360 scripts/vserver-build.functions.apt \
361 scripts/vserver-build.functions.rpm \
362 scripts/vserver-build.functions.pkgmgmt \
363 scripts/vserver-build.functions.yum \
364 + scripts/vserver-build.functions.poldek \
365 scripts/vserver-setup.functions \
366 scripts/vserver.functions \
367 scripts/vserver.start \
369 scripts_pkglib_src_SCRPTS = scripts/pkgmgmt \
370 scripts/vapt-get-worker \
372 + scripts/vpoldek-worker \
373 scripts/vrpm-worker \
374 scripts/vrpm-preload \
375 scripts/start-vservers \
377 scripts_sbin_src_PRGS = scripts/chbind \
381 scripts/vdispatch-conf \
384 --- util-vserver-0.30.214.org/scripts/pkgmgmt 2007-09-02 22:06:41.000000000 +0200
385 +++ util-vserver-0.30.214/scripts/pkgmgmt 2007-11-15 23:20:48.221174080 +0100
390 - (RH) pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum "${YUM_RELEASEPKGS[@]}")
391 + (RH) pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum poldek "${YUM_RELEASEPKGS[@]}")
392 hasSubstring "$pkgs" ---rpm--- || {
394 * The vserver does not seem to have the 'rpm' package which is required
399 - hasSubstring "$pkgs" ---apt--- ---yum--- || {
400 + hasSubstring "$pkgs" ---apt--- ---yum--- ---poldek--- || {
402 -* The vserver does not seem to have a depsolver like 'apt' or 'yum'
403 +* The vserver does not seem to have a depsolver like 'apt', 'yum' or 'poldek'
404 installed. It is suggested to install such a program before setting
405 up internal package management."
407 @@ -368,6 +368,131 @@
411 +function processVserver_PLD()
414 + local is_internalize=$2
418 + cfgdir=$($_VSERVER_INFO "$vserver" APPDIR pkgmgmt) || \
419 + cfgdir=$($_VSERVER_INFO "$vserver" APPDIR)/pkgmgmt
421 + ## Figure out the environment....
422 + pkgmgmt.isPoldekAvailable "$cfgdir" "$vdir" "$is_internalize" || have_poldek=
424 + local POLDEKETCDIR=
425 + local POLDEKCACHEDIR=
429 + ## Create directories and assign variables where configuration
430 + ## can/will be found on the host
431 + if test -n "$is_internalize"; then
432 + verifyInternalPackages "$vserver" RH || test -n "$IS_FORCE" ||
434 +Can not continue; use '--force' to override this check"
436 + pushd "$vdir" >/dev/null
438 + test ! -L var/lib/rpm || {
439 + $_EXEC_CD /var/lib $_RM rpm &&
440 + $_EXEC_CD /var/lib $_MKDIR -m755 rpm &&
441 + $_EXEC_CD /var/lib $_CHOWN rpm:rpm rpm ||
443 + } </dev/null 2>/dev/null
445 + for i in var/tmp/poldek-cache etc/rpm etc/poldek; do
447 + $_EXEC_CD /$(dirname "$i") $_MKDIR -m755 $(basename "$i") || :
452 + if test -n "$have_poldek"; then
453 + findDir POLDEKETCDIR "$cfgdir"/poldeketc "$cfgdir"/base/poldek/etc /etc/poldek
456 + findDir RPMETCDIR "$cfgdir"/rpmetc "$cfgdir"/base/rpm/etc /etc/rpm /
457 + findDir RPMSTATEDIR "$cfgdir"/rpmstate "$cfgdir"/base/rpm/state
459 + mkdir -m755 -p "$cfgdir"
462 + if test -n "$have_poldek"; then
463 + findDir POLDEKETCDIR "$cfgdir"/poldeketc "$cfgdir"/base/poldek/etc /
464 + findDir POLDEKCACHEDIR "$cfgdir"/poldek-cache "$cfgdir"/base/poldek/cache /
466 + test "$POLDEKETCDIR" != / || POLDEKETCDIR=$cfgdir/base/poldek/etc
467 + test "$POLDEKCACHEDIR" != / || POLDEKCACHEDIR=$cfgdir/base/poldek/cache
469 + test -d "$cfgdir"/poldeketc -a -d "$cfgdir"/poldek-cache || need_base=1
472 + findDir RPMETCDIR "$cfgdir"/rpmetc "$cfgdir"/base/rpm/etc /
473 + findDir RPMSTATEDIR "$cfgdir"/rpmstate "$cfgdir"/base/rpm/state /
475 + test "$RPMETCDIR" != / || RPMETCDIR=$cfgdir/base/rpm/etc
476 + test "$RPMSTATEDIR" != / || RPMSTATEDIR=$cfgdir/base/rpm/state
478 + test -d "$cfgdir"/rpmetc -a -d "$cfgdir"/rpmstate || need_base=1
479 + test ! -e "$cfgdir"/base || need_base=
481 + test -z "$need_base" || ln -s "$PKGCFGDIR" "$cfgdir"/base
483 + mkdir -m755 -p "$PKGCFGDIR"
484 + _createDirs "$POLDEKETCDIR" "$POLDEKCACHEDIR" \
485 + "$RPMETCDIR" "$RPMSTATEDIR"
488 + ## Copy the files...
489 + if test -n "$is_internalize"; then
490 + if test -n "$have_poldek"; then
491 + _copySecure "$vdir" "$POLDEKETCDIR" /etc/poldek
492 + pushd "$vdir" >/dev/null
493 + _hashAuto /etc/poldek.conf '/'
497 + _copySecure "$vdir" "$RPMETCDIR" /etc/rpm
498 + _copySecure "$vdir" "$RPMSTATEDIR" /var/lib/rpm
500 + pushd "$vdir" >/dev/null
501 + ## remove %_dbpath settings
502 + _substFile /etc/rpm/macros '/^%_dbpath[ \t].*/D'
505 + if test -n "$have_poldek"; then
506 + _copySecureRev "$vdir" /etc/poldek "$POLDEKETCDIR"
507 + _unhashAuto "$POLDEKETCDIR"/poldek.conf '/'
510 + _copySecureRev "$vdir" /etc/rpm "$RPMETCDIR"
511 + _copySecureRev "$vdir" /var/lib/rpm "$RPMSTATEDIR"
513 + echo -e "%_dbpath\t\t$rpmdb_mntpoint" >>$RPMETCDIR/macros
517 + if test -n "$is_internalize"; then
520 + tmpdir=$($_MKTEMPDIR -p /var/tmp pgmgmt.XXXXXX)
521 + trap "$_RM -rf $tmpdir" EXIT
522 + pushd "$vdir" >/dev/null
523 + $_EXEC_CD /var/lib $_MV rpm $tmpdir/
524 + $_EXEC_CD /var/lib $_LN_S "$rpmdb_mntpoint" rpm
529 + if test -n "$is_internalize"; then
530 + $_TOUCH "$cfgdir"/internal
532 + $_RM -f "$cfgdir"/internal
536 function processVserver_Debian()
542 (redhat|mandrake) processVserver_RH "$vserver" "$IS_INTERNALIZE";;
543 + (pld) processVserver_PLD "$vserver" "$IS_INTERNALIZE";;
544 (debian) processVserver_Debian "$vserver" "$IS_INTERNALIZE";;
546 echo $"Vserver style '$style' is not supported for packagemanagment" >&2
547 --- util-vserver-0.30.214.org/scripts/util-vserver-vars.pathsubst 2007-09-02 22:06:41.000000000 +0200
548 +++ util-vserver-0.30.214/scripts/util-vserver-vars.pathsubst 2007-11-15 23:20:48.221174080 +0100
550 _LIB_VSERVER_BUILD_FUNCTIONS_RPM="$__PKGLIBDIR/vserver-build.functions.rpm"
551 _LIB_VSERVER_BUILD_FUNCTIONS_YUM="$__PKGLIBDIR/vserver-build.functions.yum"
552 _LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT="$__PKGLIBDIR/vserver-build.functions.pkgmgmt"
553 +_LIB_VSERVER_BUILD_FUNCTIONS_POLDEK="$__PKGLIBDIR/vserver-build.functions.poldek"
554 _LISTDEVIP="$__LEGACYDIR/listdevip"
555 _LOCKFILE="$__PKGLIBDIR/lockfile"
556 _MASK2PREFIX="$__PKGLIBDIR/mask2prefix"
558 _VUNIFY="$__PKGLIBDIR/vunify"
559 _VYUM="$__SBINDIR/vyum"
560 _VYUM_WORKER="$__PKGLIBDIR/vyum-worker"
561 +_VPOLDEK="$__SBINDIR/vpoldek"
562 +_VPOLDEK_WORKER="$__PKGLIBDIR/vpoldek-worker"
566 --- util-vserver-0.30.214.org/scripts/vpkg 2007-09-02 22:06:41.000000000 +0200
567 +++ util-vserver-0.30.214/scripts/vpkg 2007-11-15 23:20:48.221174080 +0100
576 + ## rpm outputs sometimes '(contains no files)', so return
577 + ## only the valid output
579 + rpm_param=( -qac --pipe "$_SED '\!^/!p;d'" );;
581 + rpm_param=( -Uvh "$@" )
582 + poldek_param=( --install -v "$@" )
586 + if test -n "$is_external"; then
588 + test -d "$cfgdir"/base/poldek -o -d "$cfgdir"/poldeketc || have_poldek=
591 + for i in /bin /usr/bin /usr/local/bin; do
592 + test ! -x "$vdir$i"/poldek || { have_poldek=1; break; }
596 + if test -n "$is_external"; then
597 + if test "$have_poldek" -a "$poldek_param"; then
598 + cmd=( "$_VPOLDEK" "$vserver" -- "${poldek_param[@]}" )
600 + cmd=( "$_VRPM" "$vserver" -- "${rpm_param[@]}" )
603 + if test "$have_poldek" -a "$poldek_param"; then
604 + cmd=( "$_VSERVER" --silent "$vserver" exec poldek "${poldek_param[@]}" )
606 + cmd=( "$_VSERVER" --silent "$vserver" exec rpm "${rpm_param[@]}" )
613 --- util-vserver-0.30.214.org/scripts/vpoldek 1970-01-01 01:00:00.000000000 +0100
614 +++ util-vserver-0.30.214/scripts/vpoldek 2007-11-15 22:00:24.000000000 +0100
619 +# Copyright (C) 2007 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
621 +# This program is free software; you can redistribute it and/or modify
622 +# it under the terms of the GNU General Public License as published by
623 +# the Free Software Foundation; version 2 of the License.
625 +# This program is distributed in the hope that it will be useful,
626 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
627 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
628 +# GNU General Public License for more details.
630 +# You should have received a copy of the GNU General Public License
631 +# along with this program; if not, write to the Free Software
632 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
634 +: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
635 +test -e "$UTIL_VSERVER_VARS" || {
636 + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
639 +. "$UTIL_VSERVER_VARS"
646 +$"Usage: $0 <vserver-name>* [--all] -- <params>+
648 +Report bugs to <$PACKAGE_BUGREPORT>."
652 +function showVersion()
655 +$"vpoldek $PACKAGE_VERSION -- poldek for vservers
656 +This program is part of $PACKAGE_STRING
658 +Copyright (C) 2007 Enrico Scholz
659 +This program is free software; you may redistribute it under the terms of
660 +the GNU General Public License. This program has absolutely no warranty."
664 +tmp=$(getopt -o +q --long help,version,debug,quiet,all -n "$0" -- "$@") || exit 1
667 +declare -a send_through poldek_opts
671 + (--help) showHelp $0 ;;
672 + (--version) showVersion ;;
673 + (--debug) send_through=( "${send_through[@]}" "$1" ); set -x;;
674 + (--quiet|-q) send_through=( "${send_through[@]}" "$1" );;
675 + (--all) poldek_opts=( "${poldek_opts[@]}" "$1" );;
676 + (--) shift; break;;
677 + (*) echo $"vpoldek: internal error; arg=='$1'" >&2; exit 1;;
682 +VSOMETHING_TITLE=vpoldek
683 +VSOMETHING_WORKER=$_VPOLDEK_WORKER
684 +VSOMETHING_PKGMGMT=1
686 +export VSOMETHING_TITLE VSOMETHING_WORKER VSOMETHING_PKGMGMT
688 +test ${#poldek_opts[@]} -eq 0 || poldek_opts=( "${poldek_opts[@]}" -- )
689 +exec $_VSOMETHING "${send_through[@]}" poldek "${poldek_opts[@]}" "$@"
690 --- util-vserver-0.30.214.org/scripts/vpoldek-worker 1970-01-01 01:00:00.000000000 +0100
691 +++ util-vserver-0.30.214/scripts/vpoldek-worker 2007-11-15 22:58:23.000000000 +0100
696 +# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
698 +# This program is free software; you can redistribute it and/or modify
699 +# it under the terms of the GNU General Public License as published by
700 +# the Free Software Foundation; version 2 of the License.
702 +# This program is distributed in the hope that it will be useful,
703 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
704 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
705 +# GNU General Public License for more details.
707 +# You should have received a copy of the GNU General Public License
708 +# along with this program; if not, write to the Free Software
709 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
713 +: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
714 +test -e "$UTIL_VSERVER_VARS" || {
715 + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
718 +. "$UTIL_VSERVER_VARS"
725 +pkgInit "$vserver" rpm poldek
727 +test -z "$_POLDEK" || {
728 + warning $"The environment variable \$_POLDEK is not supported anymore; please use \$POLDEK instead of"
729 + ${POLDEK:=$_POLDEK}
732 +exec ${_POLDEK:-poldek} \
734 + --cachedir=$POLDEKCACHEDIR \
735 + --conf=$POLDEK_CONFIG \
736 + --pmcmd=$RPM_BINARY \
738 --- util-vserver-0.30.214.org/scripts/vserver-build 2007-09-02 22:06:41.000000000 +0200
739 +++ util-vserver-0.30.214/scripts/vserver-build 2007-11-15 23:20:48.224507577 +0100
741 yum ... -- -d <distribution>
742 ... installs the base-packages of the given distribution with
744 + poldek ... -- -d <distribution>
745 + ... installs the base-packages of the given distribution with
747 rpm ... -- [-d <distribution>] --empty|([--force] [--nodeps] <manifest>)+
748 ... installs lists of rpm-packages
749 skeleton ... -- [<cmd> <args>*]
753 (xlegacy) exec $_VSERVER_LEGACY "$VSERVER_NAME" build "$@" ;;
754 - (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone)
755 + (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone|xpoldek)
756 . $__PKGLIBDIR/vserver-build.$method
758 (x) panic $"No build-method specified";;
759 --- util-vserver-0.30.214.org/scripts/vserver-build.functions 2007-09-02 22:06:41.000000000 +0200
760 +++ util-vserver-0.30.214/scripts/vserver-build.functions 2007-11-15 23:20:48.224507577 +0100
762 elif test -e /etc/slackware-version; then
763 set -- $(cat /etc/slackware-version)
764 DISTRIBUTION=slackware$2
765 + elif test -e /etc/pld-release; then
768 + set -- $(cat /etc/pld-release)
769 + DISTRIBUTION=pld-$(echo $2 | tr A-Z a-z)
771 elif test -n "$1"; then
774 --- util-vserver-0.30.214/scripts/vserver-build.functions.poldek 2008-03-25 20:37:09.000000000 +0200
775 +++ util-vserver-0.30.214/scripts/vserver-build.functions.poldek 2008-03-25 20:37:09.000000000 +0200
779 +# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
781 +# This program is free software; you can redistribute it and/or modify
782 +# it under the terms of the GNU General Public License as published by
783 +# the Free Software Foundation; version 2 of the License.
785 +# This program is distributed in the hope that it will be useful,
786 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
787 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
788 +# GNU General Public License for more details.
790 +# You should have received a copy of the GNU General Public License
791 +# along with this program; if not, write to the Free Software
792 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
794 +function poldek.installBasePackages
799 + test "$dir" != / || return 0
800 + for filelist in "$dir"/*; do
801 + isRegularFile "$filelist" || continue
803 + local can_fail=false
804 + local flags='--install'
806 + set -- $(<$filelist)
807 + while test "$#" -gt 0; do
809 + --reinstall) flags='--reinstall';;
810 + --can-fail) can_fail=true;;
815 + "$_VPOLDEK" "$name" -- $flags $* || $can_fail
819 +function poldek.initVariables
821 + findFile POLDEKCONFDEFAULT \
822 + "$__CONFDIR/.distributions/$DISTRIBUTION/poldek/poldek.conf" \
823 + "$__CONFDIR/.defaults/apps/pkgmgmt/poldek/poldek.conf" \
824 + "$__DISTRIBDIR/$DISTRIBUTION/poldek/poldek.conf" \
825 + "$__DISTRIBDIR/defaults/poldek/poldek.conf" \
829 +function poldek.initFilesystem
831 + mkdir -p "$PKGCFGDIR"/poldek/etc/repos.d
833 + $_LN_S "$__CONFDIR"/.defaults/cachebase/poldek "$PKGCFGDIR"/poldek/cache
835 + populateDirectory "$PKGCFGDIR/poldek/etc" \
836 + "$__DISTRIBDIR/defaults/poldek" \
837 + "$__DISTRIBDIR/$DISTRIBUTION/poldek" \
838 + "$__CONFDIR/.distributions/$DISTRIBUTION/poldek"
840 + populateDirectory "$PKGCFGDIR/poldek/etc/repos.d" \
841 + "$__DISTRIBDIR/defaults/poldek/repos.d" \
842 + "$__DISTRIBDIR/$DISTRIBUTION/poldek/repos.d" \
843 + "$__CONFDIR/.distributions/$DISTRIBUTION/poldek/repos.d"
845 + if [ -n "$SETUP_MACHINE" ]; then
846 + say "Using $SETUP_MACHINE as machine"
847 + sed -i -e "s#^\(_arch\s*\)=.*#\1= $SETUP_MACHINE#" "$PKGCFGDIR"/poldek/etc/repos.d/*.conf
850 + if [ -n "$MIRROR" ]; then
851 + say "Using $MIRROR as mirror URL"
852 + sed -i -e "s#^\(_prefix\s*\)=.*#\1= $MIRROR#" "$PKGCFGDIR"/poldek/etc/repos.d/*.conf
855 +# test -z "$POLDEKCONFDEFAULT" || \
856 +# $_LN_S "$POLDEKCONFDEFAULT" "$PKGCFGDIR"/poldek/etc/
858 --- util-vserver-0.30.214/scripts/vserver-build.poldek 2007-11-15 23:20:48.224507577 +0100
859 +++ util-vserver-0.30.214/scripts/vserver-build.poldek 2008-03-25 20:25:23.000000000 +0200
863 +# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
865 +# This program is free software; you can redistribute it and/or modify
866 +# it under the terms of the GNU General Public License as published by
867 +# the Free Software Foundation; version 2 of the License.
869 +# This program is distributed in the hope that it will be useful,
870 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
871 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
872 +# GNU General Public License for more details.
874 +# You should have received a copy of the GNU General Public License
875 +# along with this program; if not, write to the Free Software
876 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
878 +tmp=$(getopt -o +d:,m: --long debug -n "$0" -- "$@") || exit 1
881 +. "$_LIB_VSERVER_BUILD_FUNCTIONS_RPM"
882 +. "$_LIB_VSERVER_BUILD_FUNCTIONS_POLDEK"
883 +. "$_LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT"
887 + (-d) DISTRIBUTION=$2; shift;;
888 + (-m) MIRROR=$2; shift;;
890 + (--) shift; break ;;
891 + (*) echo "vserver-build.poldek: internal error: unrecognized option '$1'" >&2
902 +pkgmgmt.initVariables
904 +poldek.initVariables
906 +base.initFilesystem "$OPTION_FORCE"
907 +pkgmgmt.initFilesystem "$OPTION_FORCE"
909 +poldek.initFilesystem
911 +setup_writeOption "$VSERVER_NAME"
912 +setup_writeInitialFstab
914 +test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"
915 +rpm.initDB "$SETUP_CONFDIR"
916 +rpm.importGPGPubKeys "$SETUP_CONFDIR" \
917 + "$__CONFDIR/.distributions/$DISTRIBUTION/pubkeys" \
918 + "$__CONFDIR/.distributions/.common/pubkeys" \
919 + "$__DISTRIBDIR/$DISTRIBUTION/pubkeys"
921 +$_VPOLDEK "$SETUP_CONFDIR" -- --update-whole
922 +poldek.installBasePackages "$SETUP_CONFDIR" "$PKGINSTALLDIR"
923 +test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"