From 102f67f2326a598d67705a896e2336df84db0ba6 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Sun, 20 Jan 2013 00:42:13 +0100
Subject: [PATCH] look in the right place
---
vbuild-init-vserver.sh | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index d28b489b..752cbc9a 100755
--- a/vbuild-init-vserver.sh
+++ b/vbuild-init-vserver.sh
@@ -299,8 +299,9 @@ function setup_vserver () {
# debugging
# on precise it looks like at some point when installing additional packages we're losing /etc/resolv.conf
function status_resolv () {
+ vserver=$1; shift
echo "xxxxxxxxxxxxxxxxxxxx" status_resolv "$@"
- ls -l /etc/resolv.conf* || :
+ ls -l /vservers/$vserver/etc/resolv.conf* || :
echo "xxxxxxxxxxxxxxxxxxxx" status_resolv "$@"
}
@@ -319,7 +320,7 @@ function devel_or_vtest_tools () {
pkgsfile=$(pl_locateDistroFile $DIRNAME $pldistro $PREINSTALLED)
- status_resolv "entering devel_or_vtest_tools"
+ status_resolv $vserver "entering devel_or_vtest_tools"
### install individual packages, then groups
# get target arch - use uname -i here (we want either x86_64 or i386)
@@ -349,14 +350,15 @@ function devel_or_vtest_tools () {
# also adding a link to updates sounds about right
( cd /vservers/$vserver/etc/apt ; head -1 sources.list | sed -e 's, main,-updates main,' > sources.list.d/updates.list )
fi
- status_resolv "before apt-get update & upgrade"
+ status_resolv $vserver "before apt-get update"
$personality vserver $vserver exec apt-get update
+ status_resolv $vserver "before apt-get upgrade"
$personality vserver $vserver exec apt-get -y upgrade
# handle this one firt off to be sure; mostly cosmetic but avoid a huge amount of warnings
$personality vserver $vserver exec apt-get install -y locales
# install required packages
# all in a single batch
- status_resolv "before apt-get install all packages"
+ status_resolv $vserver "before apt-get install all packages"
[ -n "$packages" ] && $personality vserver $vserver exec apt-get install -y --ignore-missing $packages || :
# of course, on ubuntu apt-get --ignore-missing .. does not ignore missing packages !
# check it up a bit
@@ -365,7 +367,7 @@ function devel_or_vtest_tools () {
echo "==========(debian) package $package OK (1)"
else
# try to install it individually - so this is for ubuntu
- status_resolv "before apt-get install specific to $package"
+ status_resolv $vserver "before apt-get install specific to $package"
$personality vserver $vserver exec apt-get install -y $package || :
# still not there ?
if $personality vserver $vserver exec dpkg -l $package >& /dev/null ; then
@@ -375,7 +377,7 @@ function devel_or_vtest_tools () {
fi
fi
done
- status_resolv "Done"
+ status_resolv $vserver "Done"
### xxx todo install groups with apt..
;;
*)
--
2.47.0