git://git.onelab.eu
/
build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Setting tag nodemanager-5.2-9
[build.git]
/
vbuild-init-vserver.sh
diff --git
a/vbuild-init-vserver.sh
b/vbuild-init-vserver.sh
index
11e3090
..
301b838
100755
(executable)
--- a/
vbuild-init-vserver.sh
+++ b/
vbuild-init-vserver.sh
@@
-246,7
+246,9
@@
function setup_vserver () {
# start the vserver so we can do the following operations
# redirect out/err to protect against the vserver's init sequence getting stalled
# mostly used for f10 vservers created remotely through ssh
# start the vserver so we can do the following operations
# redirect out/err to protect against the vserver's init sequence getting stalled
# mostly used for f10 vservers created remotely through ssh
- $personality vserver $VERBOSE $vserver start >& /dev/null
+ # with ubuntu/raring, somehow this fails, so ignore retcod,
+ # as subsequent vserver exec will fail anyway
+ $personality vserver $VERBOSE $vserver start >& /dev/null || :
if [ "$pkg_method" == "yum" ] ; then
$personality vserver $VERBOSE $vserver exec sh -c "rm -f /var/lib/rpm/__db*"
if [ "$pkg_method" == "yum" ] ; then
$personality vserver $VERBOSE $vserver exec sh -c "rm -f /var/lib/rpm/__db*"
@@
-274,6
+276,10
@@
function setup_vserver () {
# try the simple way, if that fails try to cross fix the rpm hashes
$personality vserver $VERBOSE $vserver exec rpm --rebuilddb || translate_rpm_hashes $personality $vserver
# try the simple way, if that fails try to cross fix the rpm hashes
$personality vserver $VERBOSE $vserver exec rpm --rebuilddb || translate_rpm_hashes $personality $vserver
+
+ elif [ "$pkg_method" == "debootstrap" ] ; then
+ # just check the vm is running
+ $personality vserver $VERBOSE $vserver exec arch
fi
# check if the vserver kernel is using VSERVER_DEVICE (vdevmap) support
fi
# check if the vserver kernel is using VSERVER_DEVICE (vdevmap) support