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
- creates a vbuild with an IP address assigned - from vs2.3 this is mandatory for...
[build.git]
/
vbuild-init-vserver.sh
diff --git
a/vbuild-init-vserver.sh
b/vbuild-init-vserver.sh
index
8b74e91
..
0b487f1
100755
(executable)
--- a/
vbuild-init-vserver.sh
+++ b/
vbuild-init-vserver.sh
@@
-7,7
+7,7
@@
DIRNAME=$(dirname $0)
# pkgs parsing utilities
PATH=$(dirname $0):$PATH . build.common
# pkgs parsing utilities
PATH=$(dirname $0):$PATH . build.common
-DEFAULT_FCDISTRO=f
7
+DEFAULT_FCDISTRO=f
8
DEFAULT_PLDISTRO=planetlab
DEFAULT_PERSONALITY=linux32
DEFAULT_PLDISTRO=planetlab
DEFAULT_PERSONALITY=linux32
@@
-98,7
+98,11
@@
function setup_vserver () {
[ -d /vservers/$vserver ]
if [ ! -z "$personality" ] ; then
[ -d /vservers/$vserver ]
if [ ! -z "$personality" ] ; then
- registered_personality=$(grep $personality /etc/vservers/$vserver/personality | wc -l)
+ if [ -f "/etc/vservers/$vserver/personality" ] ; then
+ registered_personality=$(grep $personality /etc/vservers/$vserver/personality | wc -l)
+ else
+ registered_personality=0
+ fi
if [ $registered_personality -eq 0 -a "$personality" != "linux64" ] ; then
echo $personality >> /etc/vservers/$vserver/personality
fi
if [ $registered_personality -eq 0 -a "$personality" != "linux64" ] ; then
echo $personality >> /etc/vservers/$vserver/personality
fi
@@
-120,10
+124,17
@@
function setup_vserver () {
# for /etc/plc.d/gpg - need to init /dev/random
cap=$(grep ^CAP_MKNOD /etc/vservers/$vserver/bcapabilities | wc -l)
[ $cap -eq 0 ] && echo 'CAP_MKNOD' >> /etc/vservers/$vserver/bcapabilities
# for /etc/plc.d/gpg - need to init /dev/random
cap=$(grep ^CAP_MKNOD /etc/vservers/$vserver/bcapabilities | wc -l)
[ $cap -eq 0 ] && echo 'CAP_MKNOD' >> /etc/vservers/$vserver/bcapabilities
+ cap=$(grep ^CAP_NET_BIND_SERVICE /etc/vservers/$vserver/bcapabilities | wc -l)
+ [ $cap -eq 0 ] && echo 'CAP_NET_BIND_SERVICE' >> /etc/vservers/$vserver/bcapabilities
fi
$personality vyum $vserver -- -y install yum
fi
$personality vyum $vserver -- -y install yum
- $personality vserver $VERBOSE $vserver pkgmgmt internalize
+ # ditto
+ for i in 1 2 3 4 5 ; do
+ $personality vserver $VERBOSE $vserver pkgmgmt internalize && break || true
+ echo "Waiting for one minute"
+ sleep 60
+ done
# start the vserver so we can do the following operations
$personality vserver $VERBOSE $vserver start
# start the vserver so we can do the following operations
$personality vserver $VERBOSE $vserver start
@@
-135,9
+146,11
@@
function setup_vserver () {
# set up resolv.conf
cp /etc/resolv.conf /vservers/$vserver/etc/resolv.conf
# set up resolv.conf
cp /etc/resolv.conf /vservers/$vserver/etc/resolv.conf
+ # and /etc/hosts for at least localhost
+ [ -f /vservers/$vserver/etc/hosts ] || echo "127.0.0.1 localhost localhost.localdomain" > /vservers/$vserver/etc/hosts
}
}
-function devel_tools () {
+function devel_
or_vtest_
tools () {
set -x
set -e
set -x
set -e
@@
-152,13
+165,13
@@
function devel_tools () {
if [ -n "$VBUILD_MODE" ] ; then
pkgsname=devel.pkgs
else
if [ -n "$VBUILD_MODE" ] ; then
pkgsname=devel.pkgs
else
- pkgsname=
native-shell
.pkgs
+ pkgsname=
vtest
.pkgs
fi
pkgsfile=$(pl_locateDistroFile $DIRNAME $pldistro $pkgsname)
# install individual packages, then groups
fi
pkgsfile=$(pl_locateDistroFile $DIRNAME $pldistro $pkgsname)
# install individual packages, then groups
- packages=$(pl_getPackages $
{fcdistro}
$pkgsfile)
- groups=$(pl_getGroups $
{fcdistro}
$pkgsfile)
+ packages=$(pl_getPackages $
fcdistro $pldistro
$pkgsfile)
+ groups=$(pl_getGroups $
fcdistro $pldistro
$pkgsfile)
[ -n "$packages" ] && $personality vserver $vserver exec yum -y install $packages
[ -n "$groups" ] && $personality vserver $vserver exec yum -y groupinstall $groups
[ -n "$packages" ] && $personality vserver $vserver exec yum -y install $packages
[ -n "$groups" ] && $personality vserver $vserver exec yum -y groupinstall $groups
@@
-191,7
+204,7
@@
function post_install_vbuild () {
done
# create symlink for /dev/fd
done
# create symlink for /dev/fd
-
ln -f
s /proc/self/fd /dev/fd
+
[ ! -e "/dev/fd" ] && ln -
s /proc/self/fd /dev/fd
# modify /etc/rpm/macros to not use /sbin/new-kernel-pkg
sed -i 's,/sbin/new-kernel-pkg:,,' /etc/rpm/macros
# modify /etc/rpm/macros to not use /sbin/new-kernel-pkg
sed -i 's,/sbin/new-kernel-pkg:,,' /etc/rpm/macros
@@
-244,6
+257,9
@@
function post_install_myplc () {
# be careful to backslash $ in this, otherwise it's the root context that's going to do the evaluation
cat << EOF | $personality vserver $VERBOSE $vserver exec bash -x
# be careful to backslash $ in this, otherwise it's the root context that's going to do the evaluation
cat << EOF | $personality vserver $VERBOSE $vserver exec bash -x
+ # create symlink for /dev/fd
+ [ ! -e "/dev/fd" ] && ln -s /proc/self/fd /dev/fd
+
# customize root's prompt
cat << PROFILE > /root/.profile
export PS1="[$vserver] \\w # "
# customize root's prompt
cat << PROFILE > /root/.profile
export PS1="[$vserver] \\w # "
@@
-324,7
+340,7
@@
function main () {
[ -z "$personality" ] && personality=$DEFAULT_PERSONALITY
setup_vserver $vserver $fcdistro $personality
[ -z "$personality" ] && personality=$DEFAULT_PERSONALITY
setup_vserver $vserver $fcdistro $personality
- devel_tools $vserver $fcdistro $pldistro $personality
+ devel_
or_vtest_
tools $vserver $fcdistro $pldistro $personality
post_install $vserver $personality
}
post_install $vserver $personality
}