# pkgs parsing utilities
PATH=$(dirname $0):$PATH . build.common
-DEFAULT_FCDISTRO=f7
+DEFAULT_FCDISTRO=f8
DEFAULT_PLDISTRO=planetlab
DEFAULT_PERSONALITY=linux32
vserver=$1; shift
fcdistro=$1; shift
- cd /etc/vservers/.distributions/${fcdistro}
+ pushd /etc/vservers/.distributions/${fcdistro}
if [ -f yum/yum.conf ] ; then
echo "Initializing yum.conf in $vserver from $(pwd)/yum"
sed -e "s!@YUMETCDIR@!/etc!g;
else
# exclude kernel from fedora repos
for i in /vservers/$vserver/etc/yum.repos.d/* ; do
- echo "exclude=kernel* ulogd iptables" >> $i
+ [ -f $i ] && echo "exclude=kernel* ulogd iptables" >> $i
done
# the build repo is not signed at this stage
cat > /vservers/$vserver/etc/yum.repos.d/myplc.repo <<EOF
EOF
fi
fi
- cd -
+ popd
}
function setup_vserver () {
[ -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
# 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
- $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
- $personality vserver $VERBOSE $vserver exec rm -f /var/lib/rpm/__db*
+ $personality vserver $VERBOSE $vserver exec sh -c "rm -f /var/lib/rpm/__db*"
$personality vserver $VERBOSE $vserver exec rpm --rebuilddb
+ # with vserver 2.3, granting the vserver CAP_MKNOD is not enough
+ # check whether we run vs2.3 or above
+ vs_version=$(uname -a | sed -e 's,.*[\.\-]vs\([0-9]\)\.\([0-9]\)\..*,\1\2,')
+ # at this stage we have here 22 or 23
+ need_vdevmap=$(( $vs_version >= 23 ))
+
+ if [ "$need_vdevmap" == 1 ] ; then
+ util_vserver_215=0
+ vdevmap --help | grep -- --set &> /dev/null && util_vserver_215=1
+
+ if [ "$util_vserver_215" == 1 ] ; then
+ ctx=$(cat /etc/vservers/$vserver/context)
+ vdevmap --set --xid $ctx --open --create --target /dev/null
+ vdevmap --set --xid $ctx --open --create --target /dev/root
+ else
+ echo "You seem to be running vs2.3 with util-vserver < 0.30.215"
+ echo "This combination is not supported by $COMMAND"
+ echo "Please upgrade your environment"
+ exit 1
+# this supposedly is an equivalent to using vdevmap as invoked above
+# but it's not going to work in this case
+# mkdir -p /etc/vservers/$vserver/apps/vdevmap/default-{block,char}
+# touch /etc/vservers/$vserver/apps/vdevmap/default-{block,char}/{open,create}
+# echo /dev/root > /etc/vservers/$vserver/apps/vdevmap/default-block/target
+# echo /dev/null > /etc/vservers/$vserver/apps/vdevmap/default-char/target
+ fi
+ fi
+
# minimal config in the vserver for yum to work
configure_yum_in_vserver $vserver $fcdistro
# 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
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
- 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
done
# create symlink for /dev/fd
- ln -fs /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
# 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 # "
PROFILE
- # turn off some services - as they'll get started through plc
- for i in mail postgresql ssh httpd ; do chkconfig $i off ; done
EOF
}
COMMAND_VBUILD="vbuild-init-vserver.sh"
-COMMAND_MYPLC="myplc-init-vserver.sh"
+COMMAND_MYPLC="vtest-init-vserver.sh"
function usage () {
set +x
echo "Usage: $COMMAND_VBUILD [options] vserver-name [ -- vserver-options ]"
[ -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
}
git://git.onelab.eu / build.git / blobdiff