diff -Nrub usr/lib/util-vserver/distributions/mandrakelinux//initpost /usr/lib/util-vserver/distributions/mandrakelinux//initpost --- distrib/mandrakelinux/initpost 1970-01-01 01:00:00.000000000 +0100 +++ distrib/mandrakelinux/initpost 2005-02-19 10:01:35.000000000 +0100 @@ -0,0 +1,75 @@ +#! /bin/bash + +# Copyright (C) 2003 Enrico Scholz +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +## HACK: this script is full of races... + +vdir=$1/vdir +. "$2" + +function relink +{ + test ! -e "$2" -o -L "$2" || mv -f "$2"{,.orig} + ln -s "$1" "$2" +} + +## Usage: subst +function subst +{ + sed -e "$2" "$1" | $_CHROOT_CAT "$1".tmp + cmp -s "$1".tmp "$1" || cat "$1".tmp | $_CHROOT_CAT "$1" + rm -f "$1".tmp +} + +pushd "$vdir"/etc/init.d &>/dev/null || + pushd "$vdir"/etc/rc.d/init.d &>/dev/null || exit 1 + + for i in *; do + test -e "$i" || continue + case "$i" in + functions|halt|killall|single) ;; + syslog) ;; + *) + $_VSERVER ----insecure "$1" chkconfig "$i" off + ;; + esac + done + + relink /bin/true halt +popd >/dev/null + +pushd "$vdir"/sbin &>/dev/null + relink /bin/true new-kernel-pkg +popd >/dev/null + +pushd "$vdir"/usr/bin &>/dev/null + relink /bin/true rhgb-client +popd >/dev/null + +pushd "$vdir"/etc &>/dev/null + # TODO: remove race/symlink-attack + echo 'NETWORKING=yes' >>sysconfig/network +popd >/dev/null + +pushd "$vdir" &>/dev/null + : | $_CHROOT_CAT /etc/sysctl.conf + echo "none / none defaults" | $_CHROOT_CAT /etc/fstab + cat "$DISTRIBDIR"/mandrakelinux/rc.sysinit | $_CHROOT_CAT /etc/rc.d/rc.sysinit.vserver + # TODO: remove race/symlink-attack + chmod +x etc/rc.d/rc.sysinit.vserver + subst etc/inittab 's!^\([^#].*:respawn:.* tty\)!#\1!; + s!si::sysinit:/etc/rc.d/rc.sysinit!si::sysinit:/etc/rc.d/rc.sysinit.vserver!' +popd >/dev/null diff -Nrub usr/lib/util-vserver/distributions/mandrakelinux//initpre /usr/lib/util-vserver/distributions/mandrakelinux//initpre --- distrib/mandrakelinux/initpre 1970-01-01 01:00:00.000000000 +0100 +++ distrib/mandrakelinux/initpre 2005-02-15 22:11:35.000000000 +0100 @@ -0,0 +1,22 @@ +#! /bin/bash + +# Copyright (C) 2003 Enrico Scholz +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +vdir=$1/vdir +. "$2" + +## Fix/workaround the misclassification of %_netsharedpath's parent directories +mkdir -p "$vdir"/{etc/rc.d/init.d,/sbin,/usr/bin} diff -Nrub usr/lib/util-vserver/distributions/mandrakelinux//pkgs/rpmlist.list /usr/lib/util-vserver/distributions/mandrakelinux//pkgs/rpmlist.list --- distrib/mandrakelinux/pkgs/rpmlist.list 1970-01-01 01:00:00.000000000 +0100 +++ distrib/mandrakelinux/pkgs/rpmlist.list 2005-02-19 18:05:49.323640760 +0100 @@ -0,0 +1 @@ +basesystem diff -Nrub usr/lib/util-vserver/distributions/mandrakelinux//pubkeys/pubkey /usr/lib/util-vserver/distributions/mandrakelinux//pubkeys/pubkey --- distrib/mandrakelinux/pubkeys/pubkey 1970-01-01 01:00:00.000000000 +0100 +++ distrib/mandrakelinux/pubkeys/pubkey 2005-02-19 17:38:49.000000000 +0100 @@ -0,0 +1,27 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.2.3 (GNU/Linux) + +mQGiBD/XT6oRBADPpYAPClDtKLGSZKmDU3pI9XCrsa+sR3CAJgrscSsffDQFEV7V +jgO520G3+qBMG/ArgFHrJyFEWk4dNQsR7zRb8B+/ZFo3IhZKbk3gbjYsTrd05t4z +DDYIS/GhWKHyhopK6B9uhcKNbuAqA0fM9jDG2j46wmwtLpIrfLa/1SgQQwCgxF4B +dw4YoNhwUM98JTn3/Ojw8TcEAKLxQsGCjLQNl4DTEev7w4BKzx95eCVnQ7r7XXld +gVOgAxlywGYDJVQn3Zn9Ad4/+8g2wHXcJxLNHUEIrsdZVqllzdYiQa27TtI3RLF0 +9leKZQD1awX6sAZxYgCUlQhCukPc61FP3upyna0gWFO6Jf/iS/PhZ96T00h2Gliw +ePGTA/97g61DjVFKTlWUH1Bzz61rwtE3apsCX50W8J76Urisipl4niZC9Ns30uly +LUgLhTiCvdejqy9O1ONdH9W0ALwv1ThbRlo5I92rWLCwgUpko38qo1bSNQ7DrCfK +egKqiCpUltZ00gyUmAkKQTS9/nI/+lEKYkQJvY6ha5d3PC5SkLQqTWFuZHJha2VD +b29rZXIgPGNvb2tlckBsaW51eC1tYW5kcmFrZS5jb20+iF4EExECAB4FAj/XT6oC +GwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQ3WhNeiZ1JiRczQCdGbsWsP/kMRVH +dl1RKh8SRwpLeVcAoKc6QNmnR5a7FvrBvF1+qeeOe/cXiEYEExECAAYFAj/XVeQA +CgkQ54mK4HB3H/OgQQCdECI6SKQHUuNr5P2teLVkZzRRHtgAn04q+NhEnzdll0Ga +3SjZyV3kkCxtiEYEExECAAYFAj/XV68ACgkQRFk1+HjQGfXYaQCeK932DKZ/k7YN +aFpE/RTDTVAE3uwAoKFJgC8DPPZUvF/9//kCG6ZImPKhuQENBD/XT6sQBAD5JPDp +Z1toBcgDPsutvUfFBPJ0Iwi25p6rExQFssH7Pc9LVP1w/pXXuenuW9d1WqivU6Ah +BC7hqgjhyf12WJ/rouM52w+RqqNtcIRK4gqHqYkuP54TD6bAXERC1eTJu4/XzZPR +h5OR9FQSEmLGp7f662EqANPP3zZlE9El4zu1ywADBQQAvjEq5o0FD0zEoVhfjhsP +U/uHBG9JIwOPiWBWJlYnLefWgEU/qqGrq23bfBnHvrfS1nmBLId0j6BBhUhDWk2b +aP5GPcPb9AKXsqUtTiJGFJaIJtVJ5FQT0jvHgcgaCRAfGBCe9zBCPzxV+jaEXI26 +9n4VvGRpcK8uFTAwiFnvzmWISQQYEQIACQUCP9dPqwIbDAAKCRDdaE16JnUmJIZU +AKC45vNS3JYh5MPbW0UhOgw69M1sZgCfZI0GCIVleeEzgIx+eDBjS4zDtDU= +=NfCd +-----END PGP PUBLIC KEY BLOCK----- diff -Nrub usr/lib/util-vserver/distributions/mandrakelinux//pubkeys/pubkey2 /usr/lib/util-vserver/distributions/mandrakelinux//pubkeys/pubkey2 --- distrib/mandrakelinux/pubkeys/pubkey2 1970-01-01 01:00:00.000000000 +0100 +++ distrib/mandrakelinux/pubkeys/pubkey2 2005-02-19 17:38:49.000000000 +0100 @@ -0,0 +1,27 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.2.3 (GNU/Linux) + +mQGiBD/XT6oRBADPpYAPClDtKLGSZKmDU3pI9XCrsa+sR3CAJgrscSsffDQFEV7V +jgO520G3+qBMG/ArgFHrJyFEWk4dNQsR7zRb8B+/ZFo3IhZKbk3gbjYsTrd05t4z +DDYIS/GhWKHyhopK6B9uhcKNbuAqA0fM9jDG2j46wmwtLpIrfLa/1SgQQwCgxF4B +dw4YoNhwUM98JTn3/Ojw8TcEAKLxQsGCjLQNl4DTEev7w4BKzx95eCVnQ7r7XXld +gVOgAxlywGYDJVQn3Zn9Ad4/+8g2wHXcJxLNHUEIrsdZVqllzdYiQa27TtI3RLF0 +9leKZQD1awX6sAZxYgCUlQhCukPc61FP3upyna0gWFO6Jf/iS/PhZ96T00h2Gliw +ePGTA/97g61DjVFKTlWUH1Bzz61rwtE3apsCX50W8J76Urisipl4niZC9Ns30uly +LUgLhTiCvdejqy9O1ONdH9W0ALwv1ThbRlo5I92rWLCwgUpko38qo1bSNQ7DrCfK +egKqiCpUltZ00gyUmAkKQTS9/nI/+lEKYkQJvY6ha5d3PC5SkLQqTWFuZHJha2VD +b29rZXIgPGNvb2tlckBsaW51eC1tYW5kcmFrZS5jb20+iF4EExECAB4FAj/XT6oC +GwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQ3WhNeiZ1JiRczQCdGbsWsP/kMRVH +dl1RKh8SRwpLeVcAoKc6QNmnR5a7FvrBvF1+qeeOe/cXiEYEExECAAYFAj/XVeQA +CgkQ54mK4HB3H/OgQQCdECI6SKQHUuNr5P2teLVkZzRRHtgAn04q+NhEnzdll0Ga +3SjZyV3kkCxtiEYEExECAAYFAj/XV68ACgkQRFk1+HjQGfXYaQCeK932DKZ/k7YN +aFpE/RTDTVAE3uwAoKFJgC8DPPZUvF/9//kCG6ZImPKhuQENBD/XT6sQBAD5JPDp +Z1toBcgDPsutvUfFBPJ0Iwi25p6rExQFssH7Pc9LVP1w/pXXuenuW9d1WqivU6Ah +BC7hqgjhyf12WJ/rouM52w+RqqNtcIRK4gqHqYkuP54TD6bAXERC1eTJu4/XzZPR +h5OR9FQSEmLGp7f662EqANPP3zZlE9El4zu1ywADBQQAvjEq5o0FD0zEoVhfjhsP +U/uHBG9JIwOPiWBWJlYnLefWgEU/qqGrq23bfBnHvrfS1nmBLId0j6BBhUhDWk2b +aP5GPcPb9AKXsqUtTiJGFJaIJtVJ5FQT0jvHgcgaCRAfGBCe9zBCPzxV+jaEXI26 +9n4VvGRpcK8uFTAwiFnvzmWISQQYEQIACQUCP9dPqwIbDAAKCRDdaE16JnUmJIZU +AKC45vNS3JYh5MPbW0UhOgw69M1sZgCfZI0GCIVleeEzgIx+eDBjS4zDtDU= +=NfCd +-----END PGP PUBLIC KEY BLOCK----- diff -Nrub usr/lib/util-vserver/distributions/mandrakelinux//pubkeys/pubkey3 /usr/lib/util-vserver/distributions/mandrakelinux//pubkeys/pubkey3 --- distrib/mandrakelinux/pubkeys/pubkey3 1970-01-01 01:00:00.000000000 +0100 +++ distrib/mandrakelinux/pubkeys/pubkey3 2005-02-19 17:38:49.000000000 +0100 @@ -0,0 +1,25 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.0.6 (GNU/Linux) +Comment: For info see http://www.gnupg.org + +mQGiBD20yCERBADLY2x5Q7+ATSH9+jtd17hrRsWfaCOm888ITZTAmggeJ3ycxXmV +or3EfbLXVFfTuFO6pU9ExFtRA9P6DsrCrsOlidZVl7TXZBiHOUpol3OyCo8wEfZ0 +e/ZCBYNkRf6NyQwJe3KEvHDqLLjDILQ7R0VU3l5DgqZeLRvK3zCLHr+TCwCg+MOC +iJTLk+K0wh8EZbU5bMuws3cD/Ay+0y5hzxCS724RmuArM/wEBmPIJIujpcGUPaRN +oKh/U6i8j+Iybmk6AuxqXni3TFFhYFrJi2M604coAbB8fD+6QJG9eDkzgunqDQPn +avsLQmTwJsp055EjBupPa9w9B2WL77sucSYNvPvA5sbLIYo21KUWKCVLlh1ueSSN +yJoXA/4qp3O7vCjAvvY42OXn2Ntf+jOLMb6LpnoSyLWXBcNlTxEOPqZGbDZitvrw +nvzHCo23MEfXxRLO2Fbxejev+6b9NY7sVs8fE3v6MIygLBB/U5O0oekMEGHg/9e4 +qI1Yx/yXOiIQtiUzmeMV+hUNPtf2chrZO+AXo6FypcYhvpQwi7Q4SlBhY2thZ2Ug +UHJvamVjdCAoSlBQIE9mZmljaWFsIEtleXMpIDxqcGFja2FnZUB6YXJiLm9yZz6I +VwQTEQIAFwUCPbTIIQULBwoDBAMVAwIDFgIBAheAAAoJEFxs//fEMUFtUBMAn3xr +SjRzew2eWM/cnLLxNWcqOM67AJ4q2PHYXU8rk7HSk7UZaVH8fvycArkBDQQ9tMgk +EAQA2YuTdgZSHmMz8U1e4Hzk9XhnH/s+3EFnnxNm4hk4W4CSdzsrUT/zZU7M6s/g +Tyn6f1JobB+l7HeBZRTrEutvXPqLh0ZOd+fKR0XSWpDs9N7+JCxUX5E+HBkrf1uo +7bADXYtzCSyw8oyCzfPJNBz7BI4seys/zm2bkLj6XamcgJcAAwUEANGm2vSX4z6+ +RY1vkzeLeem4hCvVz5VtyvpWqJrpDpBv+pO7iTdXLe1CXx4GxAkFxcIFBK0Bo7kn +bM8Z+hu4OxPzeKmV3yrPS5rzYfakLQmkF9gwhGgDtW0/6HZJEQLJ1gtpKVO4vR0n +X/arPVu5aU47g18oarveQKAaRnVDj5TmiEYEGBECAAYFAj20yCQACgkQXGz/98Qx +QW1whwCdGC6xsW7s24rJZS2APWWjmF1+ozQAoIO9xTE3M7UugyEqHgenbPNLtd3E +=Wifs +-----END PGP PUBLIC KEY BLOCK----- diff -Nrub usr/lib/util-vserver/distributions/mandrakelinux//pubkeys/pubkey_contrib /usr/lib/util-vserver/distributions/mandrakelinux//pubkeys/pubkey_contrib --- distrib/mandrakelinux/pubkeys/pubkey_contrib 1970-01-01 01:00:00.000000000 +0100 +++ distrib/mandrakelinux/pubkeys/pubkey_contrib 2005-02-19 17:38:49.000000000 +0100 @@ -0,0 +1,27 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.2.3 (GNU/Linux) + +mQGiBD/XT6oRBADPpYAPClDtKLGSZKmDU3pI9XCrsa+sR3CAJgrscSsffDQFEV7V +jgO520G3+qBMG/ArgFHrJyFEWk4dNQsR7zRb8B+/ZFo3IhZKbk3gbjYsTrd05t4z +DDYIS/GhWKHyhopK6B9uhcKNbuAqA0fM9jDG2j46wmwtLpIrfLa/1SgQQwCgxF4B +dw4YoNhwUM98JTn3/Ojw8TcEAKLxQsGCjLQNl4DTEev7w4BKzx95eCVnQ7r7XXld +gVOgAxlywGYDJVQn3Zn9Ad4/+8g2wHXcJxLNHUEIrsdZVqllzdYiQa27TtI3RLF0 +9leKZQD1awX6sAZxYgCUlQhCukPc61FP3upyna0gWFO6Jf/iS/PhZ96T00h2Gliw +ePGTA/97g61DjVFKTlWUH1Bzz61rwtE3apsCX50W8J76Urisipl4niZC9Ns30uly +LUgLhTiCvdejqy9O1ONdH9W0ALwv1ThbRlo5I92rWLCwgUpko38qo1bSNQ7DrCfK +egKqiCpUltZ00gyUmAkKQTS9/nI/+lEKYkQJvY6ha5d3PC5SkLQqTWFuZHJha2VD +b29rZXIgPGNvb2tlckBsaW51eC1tYW5kcmFrZS5jb20+iF4EExECAB4FAj/XT6oC +GwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQ3WhNeiZ1JiRczQCdGbsWsP/kMRVH +dl1RKh8SRwpLeVcAoKc6QNmnR5a7FvrBvF1+qeeOe/cXiEYEExECAAYFAj/XVeQA +CgkQ54mK4HB3H/OgQQCdECI6SKQHUuNr5P2teLVkZzRRHtgAn04q+NhEnzdll0Ga +3SjZyV3kkCxtiEYEExECAAYFAj/XV68ACgkQRFk1+HjQGfXYaQCeK932DKZ/k7YN +aFpE/RTDTVAE3uwAoKFJgC8DPPZUvF/9//kCG6ZImPKhuQENBD/XT6sQBAD5JPDp +Z1toBcgDPsutvUfFBPJ0Iwi25p6rExQFssH7Pc9LVP1w/pXXuenuW9d1WqivU6Ah +BC7hqgjhyf12WJ/rouM52w+RqqNtcIRK4gqHqYkuP54TD6bAXERC1eTJu4/XzZPR +h5OR9FQSEmLGp7f662EqANPP3zZlE9El4zu1ywADBQQAvjEq5o0FD0zEoVhfjhsP +U/uHBG9JIwOPiWBWJlYnLefWgEU/qqGrq23bfBnHvrfS1nmBLId0j6BBhUhDWk2b +aP5GPcPb9AKXsqUtTiJGFJaIJtVJ5FQT0jvHgcgaCRAfGBCe9zBCPzxV+jaEXI26 +9n4VvGRpcK8uFTAwiFnvzmWISQQYEQIACQUCP9dPqwIbDAAKCRDdaE16JnUmJIZU +AKC45vNS3JYh5MPbW0UhOgw69M1sZgCfZI0GCIVleeEzgIx+eDBjS4zDtDU= +=NfCd +-----END PGP PUBLIC KEY BLOCK----- diff -Nrub usr/lib/util-vserver/distributions/mandrakelinux//pubkeys/pubkey_jpackage /usr/lib/util-vserver/distributions/mandrakelinux//pubkeys/pubkey_jpackage --- distrib/mandrakelinux/pubkeys/pubkey_jpackage 1970-01-01 01:00:00.000000000 +0100 +++ distrib/mandrakelinux/pubkeys/pubkey_jpackage 2005-02-19 17:38:49.000000000 +0100 @@ -0,0 +1,25 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.0.6 (GNU/Linux) +Comment: For info see http://www.gnupg.org + +mQGiBD20yCERBADLY2x5Q7+ATSH9+jtd17hrRsWfaCOm888ITZTAmggeJ3ycxXmV +or3EfbLXVFfTuFO6pU9ExFtRA9P6DsrCrsOlidZVl7TXZBiHOUpol3OyCo8wEfZ0 +e/ZCBYNkRf6NyQwJe3KEvHDqLLjDILQ7R0VU3l5DgqZeLRvK3zCLHr+TCwCg+MOC +iJTLk+K0wh8EZbU5bMuws3cD/Ay+0y5hzxCS724RmuArM/wEBmPIJIujpcGUPaRN +oKh/U6i8j+Iybmk6AuxqXni3TFFhYFrJi2M604coAbB8fD+6QJG9eDkzgunqDQPn +avsLQmTwJsp055EjBupPa9w9B2WL77sucSYNvPvA5sbLIYo21KUWKCVLlh1ueSSN +yJoXA/4qp3O7vCjAvvY42OXn2Ntf+jOLMb6LpnoSyLWXBcNlTxEOPqZGbDZitvrw +nvzHCo23MEfXxRLO2Fbxejev+6b9NY7sVs8fE3v6MIygLBB/U5O0oekMEGHg/9e4 +qI1Yx/yXOiIQtiUzmeMV+hUNPtf2chrZO+AXo6FypcYhvpQwi7Q4SlBhY2thZ2Ug +UHJvamVjdCAoSlBQIE9mZmljaWFsIEtleXMpIDxqcGFja2FnZUB6YXJiLm9yZz6I +VwQTEQIAFwUCPbTIIQULBwoDBAMVAwIDFgIBAheAAAoJEFxs//fEMUFtUBMAn3xr +SjRzew2eWM/cnLLxNWcqOM67AJ4q2PHYXU8rk7HSk7UZaVH8fvycArkBDQQ9tMgk +EAQA2YuTdgZSHmMz8U1e4Hzk9XhnH/s+3EFnnxNm4hk4W4CSdzsrUT/zZU7M6s/g +Tyn6f1JobB+l7HeBZRTrEutvXPqLh0ZOd+fKR0XSWpDs9N7+JCxUX5E+HBkrf1uo +7bADXYtzCSyw8oyCzfPJNBz7BI4seys/zm2bkLj6XamcgJcAAwUEANGm2vSX4z6+ +RY1vkzeLeem4hCvVz5VtyvpWqJrpDpBv+pO7iTdXLe1CXx4GxAkFxcIFBK0Bo7kn +bM8Z+hu4OxPzeKmV3yrPS5rzYfakLQmkF9gwhGgDtW0/6HZJEQLJ1gtpKVO4vR0n +X/arPVu5aU47g18oarveQKAaRnVDj5TmiEYEGBECAAYFAj20yCQACgkQXGz/98Qx +QW1whwCdGC6xsW7s24rJZS2APWWjmF1+ozQAoIO9xTE3M7UugyEqHgenbPNLtd3E +=Wifs +-----END PGP PUBLIC KEY BLOCK----- diff -Nrub usr/lib/util-vserver/distributions/mandrakelinux//pubkeys/pubkey_main /usr/lib/util-vserver/distributions/mandrakelinux//pubkeys/pubkey_main --- distrib/mandrakelinux/pubkeys/pubkey_main 1970-01-01 01:00:00.000000000 +0100 +++ distrib/mandrakelinux/pubkeys/pubkey_main 2005-02-19 17:38:49.000000000 +0100 @@ -0,0 +1,27 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.2.3 (GNU/Linux) + +mQGiBD/XT6oRBADPpYAPClDtKLGSZKmDU3pI9XCrsa+sR3CAJgrscSsffDQFEV7V +jgO520G3+qBMG/ArgFHrJyFEWk4dNQsR7zRb8B+/ZFo3IhZKbk3gbjYsTrd05t4z +DDYIS/GhWKHyhopK6B9uhcKNbuAqA0fM9jDG2j46wmwtLpIrfLa/1SgQQwCgxF4B +dw4YoNhwUM98JTn3/Ojw8TcEAKLxQsGCjLQNl4DTEev7w4BKzx95eCVnQ7r7XXld +gVOgAxlywGYDJVQn3Zn9Ad4/+8g2wHXcJxLNHUEIrsdZVqllzdYiQa27TtI3RLF0 +9leKZQD1awX6sAZxYgCUlQhCukPc61FP3upyna0gWFO6Jf/iS/PhZ96T00h2Gliw +ePGTA/97g61DjVFKTlWUH1Bzz61rwtE3apsCX50W8J76Urisipl4niZC9Ns30uly +LUgLhTiCvdejqy9O1ONdH9W0ALwv1ThbRlo5I92rWLCwgUpko38qo1bSNQ7DrCfK +egKqiCpUltZ00gyUmAkKQTS9/nI/+lEKYkQJvY6ha5d3PC5SkLQqTWFuZHJha2VD +b29rZXIgPGNvb2tlckBsaW51eC1tYW5kcmFrZS5jb20+iF4EExECAB4FAj/XT6oC +GwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQ3WhNeiZ1JiRczQCdGbsWsP/kMRVH +dl1RKh8SRwpLeVcAoKc6QNmnR5a7FvrBvF1+qeeOe/cXiEYEExECAAYFAj/XVeQA +CgkQ54mK4HB3H/OgQQCdECI6SKQHUuNr5P2teLVkZzRRHtgAn04q+NhEnzdll0Ga +3SjZyV3kkCxtiEYEExECAAYFAj/XV68ACgkQRFk1+HjQGfXYaQCeK932DKZ/k7YN +aFpE/RTDTVAE3uwAoKFJgC8DPPZUvF/9//kCG6ZImPKhuQENBD/XT6sQBAD5JPDp +Z1toBcgDPsutvUfFBPJ0Iwi25p6rExQFssH7Pc9LVP1w/pXXuenuW9d1WqivU6Ah +BC7hqgjhyf12WJ/rouM52w+RqqNtcIRK4gqHqYkuP54TD6bAXERC1eTJu4/XzZPR +h5OR9FQSEmLGp7f662EqANPP3zZlE9El4zu1ywADBQQAvjEq5o0FD0zEoVhfjhsP +U/uHBG9JIwOPiWBWJlYnLefWgEU/qqGrq23bfBnHvrfS1nmBLId0j6BBhUhDWk2b +aP5GPcPb9AKXsqUtTiJGFJaIJtVJ5FQT0jvHgcgaCRAfGBCe9zBCPzxV+jaEXI26 +9n4VvGRpcK8uFTAwiFnvzmWISQQYEQIACQUCP9dPqwIbDAAKCRDdaE16JnUmJIZU +AKC45vNS3JYh5MPbW0UhOgw69M1sZgCfZI0GCIVleeEzgIx+eDBjS4zDtDU= +=NfCd +-----END PGP PUBLIC KEY BLOCK----- diff -Nrub usr/lib/util-vserver/distributions/mandrakelinux//rc.sysinit /usr/lib/util-vserver/distributions/mandrakelinux//rc.sysinit --- distrib/mandrakelinux/rc.sysinit 1970-01-01 01:00:00.000000000 +0100 +++ distrib/mandrakelinux/rc.sysinit 2005-02-15 22:11:35.000000000 +0100 @@ -0,0 +1,4 @@ +#! /bin/sh + +rm -f /var/lock/subsys/* /var/run/* /var/run/*/* 2>/dev/null +true diff -Nrub usr/lib/util-vserver/functions /usr/lib/util-vserver/functions --- scripts/functions 2005-02-19 17:54:19.038580040 +0100 +++ scripts/functions 2005-02-19 17:51:22.203463064 +0100 @@ -236,7 +236,7 @@ if test -z "$WORKAROUND_106057"; then _rpmdb_mntpoint=/dev else - _rpmdb_mntpoint=/.rpmdb + _rpmdb_mntpoint=$BASEDIR/.rpmdb fi } @@ -287,6 +287,16 @@ fi } +function _pkgSetVarsUrpmi +{ + if test -n "$PKGDIR"; then + findDir URPMIETCDIR $PKGDIR/urpmietc $PKGDIR/base/urpmi/etc /etc/urpmi + findDir URPMICAHEDIR $PKGDIR/urpmicache $PKGDIR/base/urpmi/cache + else + findDir URPMIETCDIR "$VDIR"/etc/urpmi /etc/urpmi + findDir URPMICACHEDIR "$VDIR"/var/cache/urpmi + fi +} function _pkgMountBase { @@ -303,8 +313,14 @@ : } +function _pkgMountUrpmi +{ + : +} + function _pkgMountRPM { + _pkgMountBindDir "$RPMETCDIR" /etc/rpm test "$RPMLIBDIR" = "/" || _pkgMountBindDir "$RPMLIBDIR" /usr/lib/rpm @@ -317,6 +333,7 @@ $_SECURE_MOUNT --chroot -n -t proc none /proc popd >/dev/null + } function _pkgSetEnvBase @@ -339,6 +356,11 @@ : } +function _pkgSetEnvUrpmi +{ + : +} + function _pkgSetEnvRPM { CUR_VSERVER=$vserver @@ -346,6 +368,7 @@ RPM_BINARY=$_VRPM_PRELOAD export CUR_VSERVER RPM_FAKE_NAMESPACE_MOUNTS RPM_BINARY + } function pkgInit @@ -360,6 +383,7 @@ rpm) _pkgSetVarsRPM;; apt) _pkgSetVarsApt;; yum) _pkgSetVarsYum;; + urpmi) _pkgSetVarsUrpmi;; *) echo "Unknown packaging flavor" >&2; exit 1;; esac done @@ -370,6 +394,7 @@ rpm) _pkgMountRPM;; apt) _pkgMountApt;; yum) _pkgMountYum;; + urpmi) _pkgMountUrpmi;; esac done @@ -379,6 +404,7 @@ rpm) _pkgSetEnvRPM;; apt) _pkgSetEnvApt;; yum) _pkgSetEnvYum;; + urpmi) _pkgSetEnvUrpmi;; esac done diff -Nrub usr/lib/util-vserver/pkgmgmt /usr/lib/util-vserver/pkgmgmt --- scripts/pkgmgmt 2005-02-19 17:54:19.166560584 +0100 +++ scripts/pkgmgmt 2005-02-19 15:11:20.000000000 +0100 @@ -52,7 +52,7 @@ if test -z "$WORKAROUND_106057"; then rpmdb_mntpoint=/dev else - rpmdb_mntpoint=/.rpmdb + rpmdb_mntpoint=$RPMDB_PATH fi pkgmgmt.initVariables } diff -Nrub usr/lib/util-vserver/util-vserver-vars /usr/lib/util-vserver/util-vserver-vars --- scripts/util-vserver-vars.pathsubst 2005-02-19 17:54:19.282542952 +0100 +++ scripts/util-vserver-vars.pathsubst 2005-02-19 13:49:19.000000000 +0100 @@ -48,6 +48,7 @@ _LIB_VSERVER_BUILD_FUNCTIONS_APT="$PKGLIBDIR/vserver-build.functions.apt" _LIB_VSERVER_BUILD_FUNCTIONS_RPM="$PKGLIBDIR/vserver-build.functions.rpm" _LIB_VSERVER_BUILD_FUNCTIONS_YUM="$PKGLIBDIR/vserver-build.functions.yum" +_LIB_VSERVER_BUILD_FUNCTIONS_URPMI="$PKGLIBDIR/vserver-build.functions.urpmi" _LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT="$PKGLIBDIR/vserver-build.functions.pkgmgmt" _LISTDEVIP="$LEGACYDIR/listdevip" _LOCKFILE="$PKGLIBDIR/lockfile" @@ -88,6 +89,8 @@ _VSOMETHING="$SBINDIR/vsomething" _VUNAME="$SBINDIR/vuname" _VUNIFY="$PKGLIBDIR/vunify" +_VURPMI="$SBINDIR/urpmi" +_VURPMI_WORKER="$PKGLIBDIR/vurpmi-worker" _VYUM="$SBINDIR/vyum" _VYUM_WORKER="$PKGLIBDIR/vyum-worker" diff -Nrub usr/lib/util-vserver/vserver-build /usr/lib/util-vserver/vserver-build --- scripts/vserver-build 2005-02-19 17:54:19.171559824 +0100 +++ scripts/vserver-build 2005-02-17 21:22:48.000000000 +0100 @@ -121,7 +121,7 @@ case x"$method" in (xlegacy) exec $_VSERVER_LEGACY "$VSERVER_NAME" build "$@" ;; - (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm) + (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xurpmi) . $PKGLIBDIR/vserver-build.$method ;; (x) panic $"No build-method specified";; diff -Nrub scripts/vserver-build.functions.urpmi scripts/vserver-build.functions.urpmi --- scripts/vserver-build.functions.urpmi 1970-01-01 01:00:00.000000000 +0100 +++ scripts/vserver-build.functions.urpmi 2005-02-19 18:01:25.569737448 +0100 @@ -0,0 +1,85 @@ +# Copyright (C) 2005 Erwan Velu +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +#Based on the yum version +#TODO: Checking it works in all cases +# Checking The use of all variables + +function urpmi.installBasePackages +{ + local name="$1" + local dir="$2" + test "$dir" != / || return 0 + for filelist in "$dir"/*; do + test -f "$filelist" || continue + local idx=0 + local can_fail=false + local flags= + + set -- $(<$filelist) + while test "$#" -gt 0; do + case "$1" in + --reinstall) flags='';; + --can-fail) can_fail=true;; + *) break;; + esac + shift + done + "$_VURPMI" $flags --root "$VDIR" --auto $* || $can_fail + done +} + +function urpmi.initVariables +{ + RPMDB_PATH=$SETUP_CONFDIR/.rpmdb + findDir URPMIREPOSDEFAULT \ + "$CONFDIR/.distributions/$DISTRIBUTION/rpm.repos.d" \ + "$DISTRIBDIR/$DISTRIBUTION/rpm.repos.d" \ + '' +} + +function urpmi.initDB +{ + rm -rf $1/var/lib/rpm + mkdir -p $1/var/lib/rpm + rpm --root "$1" --initdb + rpm --root "$1" --rebuilddb +} + + +function urpmi.initFilesystem +{ + mkdir -p "$PKGCFGDIR"/urpmi/{etc,cache} + + populateDirectory "$PKGCFGDIR/urpmi/etc" \ + "$DISTRIBDIR/defaults/urpmi" \ + "$DISTRIBDIR/$DISTRIBUTION/urpmi" \ + "$CONFDIR/.distributions/$DISTRIBUTION/urpmi" + + ## workaround for yum's automatism to search the configuration in the chroot + local prefix='/../../../../../../../../../../../../' + local f="$PKGCFGDIR"/urpmi/etc/urpmi.cfg + if test -e "$f"; then + $_SED -e "s!@URPMIETCDIR@!$prefix$PKGCFGDIR/urpmi/etc!g; + s!@URPMICACHEDIR@!$prefix$PKGCFGDIR/urpmi/cache!g; + s!@URPMILOGDIR@!$prefix$PKGCFGDIR/urpmi!g; + " "$f" >"$f.tmp" + $_CMP -s "$f" "$f.tmp" || $_CAT "$f.tmp" >"$f" + $_RM -f "$f.tmp" + fi + + test -z "$URPMIREPOSDEFAULT" -o -e "$PKGCFGDIR/urpmi/etc/urpmi.repos.d" || \ + $_LN_S "$UPMIREPOSDEFAULT" "$PKGCFGDIR/urpmi/etc/urpmi.repos.d" +} diff -Nrub usr/lib/util-vserver/vserver-build.urpmi /usr/lib/util-vserver/vserver-build.urpmi --- scripts/vserver-build.urpmi 1970-01-01 01:00:00.000000000 +0100 +++ scripts/vserver-build.urpmi 2005-02-19 18:02:40.343370128 +0100 @@ -0,0 +1,57 @@ +# Copyright (C) 2005 Erwan Velu +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Based on the yum version + +tmp=$(getopt -o +d: --long debug -n "$0" -- "$@") || exit 1 +eval set -- "$tmp" + +. "$_LIB_VSERVER_BUILD_FUNCTIONS_RPM" +. "$_LIB_VSERVER_BUILD_FUNCTIONS_URPMI" +. "$_LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT" + +while true; do + case "$1" in + (-d) DISTRIBUTION=$2; shift;; + (--debug) set -x;; + (--) shift; break ;; + (*) echo "vserver-build.yum-rpm: internal error: unrecognized option '$1'" >&2 + exit 1 + ;; + esac + shift +done + +getDistribution + +base.initVariables +pkgmgmt.initVariables +rpm.initVariables +urpmi.initVariables + +base.initFilesystem "$OPTION_FORCE" +pkgmgmt.initFilesystem "$OPTION_FORCE" +rpm.initFilesystem +urpmi.initFilesystem +setup_writeOption "$VSERVER_NAME" +setup_writeInitialFstab +setup_writeHostFile + +test -z "$BUILD_INITPRE" || "$BUILD_INITPRE" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" +rpm.importGPGPubKeys "$SETUP_CONFDIR" "$CONFDIR/.distributions/$DISTRIBUTION/pubkeys" "$DISTRIBDIR/$DISTRIBUTION/pubkeys" +urpmi.initDB "$VDIR" +rpm.importGPGPubKeys "$SETUP_CONFDIR" "$CONFDIR/.distributions/$DISTRIBUTION/pubkeys" "$DISTRIBDIR/$DISTRIBUTION/pubkeys" +urpmi.installBasePackages "$SETUP_CONFDIR" "$PKGDIR" + +test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS" diff -Nrub usr/lib/util-vserver/vserver-setup.functions /usr/lib/util-vserver/vserver-setup.functions --- scripts/vserver-setup.functions 2005-02-19 17:54:19.173559520 +0100 +++ scripts/vserver-setup.functions 2005-02-19 11:56:44.000000000 +0100 @@ -169,6 +169,25 @@ cat "$SETUP_FSTAB" >"$SETUP_CONFDIR"/fstab } +function setup_writeHostFile +{ + tmp=${SETUP_INTERFACES[0]}; + local name=${tmp%%=*} + test "$name" != "$tmp" || name= + tmp=${tmp##${name}=} + local dev=${tmp%%:*} + test "$dev" != "$tmp" || dev= + tmp=${tmp##${dev}:} + local mask=${tmp##*/} + test "$mask" != "$tmp" || mask= + local ip=${tmp%%/${mask}} + + cat << EOF >"$VDIR"/etc/hosts +127.0.0.1 localhost localhost.localdomain +$ip $SETUP_HOSTNAME +EOF +} + function setup_test { SETUP_INTERFACES=() diff -Nrub usr/lib/util-vserver/vurpmi-worker /usr/lib/util-vserver/vurpmi-worker --- scripts/vurpmi-worker 1970-01-01 01:00:00.000000000 +0100 +++ scripts/vurpmi-worker 2005-02-19 18:03:49.997781048 +0100 @@ -0,0 +1,36 @@ +#! /bin/bash +# Copyright (C) 2005 Erwan Velu +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Based on yum version +# TODO: checking if this script is really necessary +set -e + +: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} +test -e "$UTIL_VSERVER_VARS" || { + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2 + exit 1 +} +. "$UTIL_VSERVER_VARS" +. "$_LIB_FUNCTIONS" + +vserver=$1 +shift + +pkgInit "$vserver" rpm urpmi +rpmFake.init "$vserver" + +rpmFake.exec ${_URPMI:-urpmi} \ + --root="$VDIR" \ + "$@" --- scripts/vserver-build~ 2005-02-19 18:31:29.202699861 +0100 +++ scripts/vserver-build 2005-02-19 18:37:36.595585034 +0100 @@ -56,6 +56,9 @@ yum ... -- -d ... installs the base-packages of the given distribution with help of 'vyum' + urpmi ... -- -d + ... installs the base-packages of the given distribution with + help of 'vurpmi' rpm ... -- [-d ] --empty|([--force] [--nodeps] )+ ... installs lists of rpm-packages skeleton ... -- [ *] --- Makefile.in~ 2005-02-16 00:14:40.000000000 +0100 +++ Makefile.in 2005-02-19 18:41:24.066846627 +0100 @@ -1025,7 +1025,7 @@ src/vbuild src/vcheck src/vreboot src/save_ctxinfo \ src/mask2prefix src/chroot-cat src/ifspec src/rebootmgr \ src/vdu src/vfiles scripts/vapt-get-worker scripts/vrpm-worker \ - scripts/vyum-worker scripts/vrpm-preload \ + scripts/vyum-worker scripts/vurpmi-worker scripts/vrpm-preload \ scripts/save_s_context scripts/vservers.grabinfo.sh \ scripts/vpstree scripts/vserver-copy scripts/vserver-wrapper \ scripts/vsysvwrapper scripts/vtop scripts/legacy/distrib-info \ @@ -1373,6 +1373,7 @@ scripts/vserver-build.debootstrap \ scripts/vserver-build.rpm \ scripts/vserver-build.yum \ + scripts/vserver-build.urpmi \ scripts/vserver-build.functions \ scripts/vserver-build.functions.apt \ scripts/vserver-build.functions.rpm \ @@ -1398,6 +1399,7 @@ scripts/vshelper \ scripts/vsysvwrapper \ + scripts/vurpmi-worker \ scripts/vyum-worker scripts_legacy_src_SCRPTS = scripts/legacy/save_s_context \ scripts/legacy/vserver \ --- distrib/Makefile.in.ol 2005-02-19 19:09:13.670309898 +0100 +++ distrib/Makefile.in 2005-02-19 19:10:15.792479591 +0100 @@ -253,7 +253,11 @@ nobase_distrib_SCRIPTS = redhat/initpost \ redhat/initpre \ - redhat/rc.sysinit + redhat/rc.sysinit \ + mandrakelinux/initpost \ + mandrakelinux/initpre \ + mandrakelinux/rc.sysinit + nobase_distrib_DATA = defaults/devs \ defaults/apt.conf \ @@ -267,7 +271,14 @@ fc3/yum/yum.conf $(wildcard fc3/yum.repos.d/fedora*.repo) \ $(wildcard fc3/rpmlist.d/*.lst) $(wildcard fc3/rpmlist.d/*.opt) \ suse91/apt/rpmpriorities suse91/pkgs/01 suse91/pkgs/02 \ - suse91/rpm/macros + suse91/rpm/macros\ + mandrakelinux/pkgs/rpmlist.list \ + mandrakelinux/pubkeys/pubkey \ + mandrakelinux/pubkeys/pubkey2 \ + mandrakelinux/pubkeys/pubkey3 \ + mandrakelinux/pubkeys/pubkey_contrib \ + mandrakelinux/pubkeys/pubkey_jpackage \ + mandrakelinux/pubkeys/pubkey_main nobase_confdistrib_DATA = rh9/apt/sources.list \ fc1/apt/sources.list \ --- contrib/manifest.dat.pathsubst~ 2005-02-01 16:59:56.000000000 +0100 +++ contrib/manifest.dat.pathsubst 2005-02-19 19:27:33.085038899 +0100 @@ -6,11 +6,13 @@ build @PKGLIBDIR@/vserver-build.skeleton build @PKGLIBDIR@/vserver-build.debootstrap build @PKGLIBDIR@/vserver-build.yum +build @PKGLIBDIR@/vserver-build.urpmi build @PKGLIBDIR@/vserver-build.rpm build @PKGLIBDIR@/vserver-build.functions build @PKGLIBDIR@/vserver-build.functions.apt build @PKGLIBDIR@/vserver-build.functions.rpm build @PKGLIBDIR@/vserver-build.functions.yum +build @PKGLIBDIR@/vserver-build.functions.urpmi build @PKGLIBDIR@/vserver-build.functions.pkgmgmt build @PKGLIBDIR@/vserver-setup.functions base @PKGLIBDIR@/vserver.functions @@ -59,6 +61,7 @@ base @PKGLIBDIR@/start-vservers build @PKGLIBDIR@/vapt-get-worker build @PKGLIBDIR@/vyum-worker +build @PKGLIBDIR@/vurpmi-worker @ENSC_HAVE_CXX_COMPILER_TRUE@build @PKGLIBDIR@/vbuild @ENSC_HAVE_CXX_COMPILER_TRUE@build @PKGLIBDIR@/vcheck build @PKGLIBDIR@/vpkg --- distrib/Makefile.in~ 2005-02-19 19:35:41.803151066 +0100 +++ distrib/Makefile.in 2005-02-19 19:38:56.779806421 +0100 @@ -437,7 +437,7 @@ distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/defaults $(distdir)/defaults/apt $(distdir)/defaults/rpm $(distdir)/fc1/apt $(distdir)/fc1/pkgs $(distdir)/fc2/apt $(distdir)/fc2/pkgs $(distdir)/fc3/pkgs $(distdir)/fc3/rpmlist.d $(distdir)/fc3/yum $(distdir)/fc3/yum.repos.d $(distdir)/misc $(distdir)/redhat $(distdir)/rh9/apt $(distdir)/rh9/pkgs $(distdir)/suse91/apt $(distdir)/suse91/pkgs $(distdir)/suse91/rpm $(distdir)/template + $(mkdir_p) $(distdir)/defaults $(distdir)/defaults/apt $(distdir)/defaults/rpm $(distdir)/fc1/apt $(distdir)/fc1/pkgs $(distdir)/fc2/apt $(distdir)/fc2/pkgs $(distdir)/fc3/pkgs $(distdir)/fc3/rpmlist.d $(distdir)/fc3/yum $(distdir)/fc3/yum.repos.d $(distdir)/misc $(distdir)/redhat $(distdir)/rh9/apt $(distdir)/rh9/pkgs $(distdir)/suse91/apt $(distdir)/suse91/pkgs $(distdir)/suse91/rpm $(distdir)/template $(distdir)/mandrakelinux/pubkeys $(distdir)/mandrakelinux $(distdir)/mandrakelinux/pkgs $(distdir)/mandrakelinux @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ --- scripts/Makefile-files~ 2005-02-01 18:23:29.000000000 +0100 +++ scripts/Makefile-files 2005-02-19 19:41:22.589532699 +0100 @@ -21,6 +21,7 @@ scripts/vapt-get-worker \ scripts/vrpm-worker \ scripts/vyum-worker \ + scripts/urpmi-worker \ scripts/vrpm-preload \ scripts/save_s_context \ scripts/vservers.grabinfo.sh \ @@ -43,11 +44,13 @@ scripts/vserver-build.debootstrap \ scripts/vserver-build.rpm \ scripts/vserver-build.yum \ + scripts/vserver-build.urpmi \ scripts/vserver-build.functions \ scripts/vserver-build.functions.apt \ scripts/vserver-build.functions.rpm \ scripts/vserver-build.functions.pkgmgmt \ scripts/vserver-build.functions.yum \ + scripts/vserver-build.functions.urpmi \ scripts/vserver-setup.functions \ scripts/vserver.functions \ scripts/vserver.start \ --- Makefile.in~ 2005-02-19 19:41:53.730097284 +0100 +++ Makefile.in 2005-02-19 19:45:32.121068253 +0100 @@ -1379,6 +1379,7 @@ scripts/vserver-build.functions.rpm \ scripts/vserver-build.functions.pkgmgmt \ scripts/vserver-build.functions.yum \ + scripts/vserver-build.functions.urpmi \ scripts/vserver-setup.functions \ scripts/vserver.functions \ scripts/vserver.start \