# pkgs parsing utilities
PATH=$(dirname $0):$PATH . build.common
-DEFAULT_FCDISTRO=f7
+DEFAULT_FCDISTRO=f8
DEFAULT_PLDISTRO=planetlab
DEFAULT_PERSONALITY=linux32
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
[ -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
fi
if [ -n "$VBUILD_MODE" ] ; then
- # set up appropriate vserver capabilities to mount, mknod and IPC_LOCK
+ ### capabilities required for a build vserver
+ # set up appropriate vserver capabilities to mount, mknod and IPC_LOCK
BCAPFILE=/etc/vservers/$vserver/bcapabilities
touch $BCAPFILE
cap=$(grep ^CAP_SYS_ADMIN /etc/vservers/$vserver/bcapabilities | wc -l)
[ $cap -eq 0 ] && echo 'CAP_MKNOD' >> /etc/vservers/$vserver/bcapabilities
cap=$(grep ^CAP_IPC_LOCK /etc/vservers/$vserver/bcapabilities | wc -l)
[ $cap -eq 0 ] && echo 'CAP_IPC_LOCK' >> /etc/vservers/$vserver/bcapabilities
+ else
+ ### capabilities required for a myplc 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
+ 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
# minimal config in the vserver for yum to work
# 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 # "
}
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 [-v] vserver-name [ -- vserver-options ]"
- echo "Usage: $COMMAND_MYPLC [-v] vserver-name repo-url [ -- vserver-options ]"
+ echo "Usage: $COMMAND_VBUILD [options] vserver-name [ -- vserver-options ]"
+ echo "Usage: $COMMAND_MYPLC [options] vserver-name repo-url [ -- vserver-options ]"
echo "Requirements: you need to have a vserver-compliant kernel,"
- echo " as well as the util-vserver RPM installed"
+ echo " as well as the util-vserver RPM installed"
echo "Description:"
- echo " This command creates a fresh vserver instance, for building, or running, myplc"
+ echo " This command creates a fresh vserver instance, for building, or running, myplc"
echo "Supported options"
echo " -f fcdistro - for creating the root filesystem - defaults to $DEFAULT_FCDISTRO"
echo " -d pldistro - defaults to $DEFAULT_PLDISTRO"
echo " -p personality - defaults to $DEFAULT_PERSONALITY"
- echo " -v : passes -v to calls to vserver"
+ echo " -v : verbose - passes -v to calls to vserver"
echo "vserver-options"
- echo " all args after the optional -- are passed to vserver <name> build <options>"
- echo " typical usage is e.g. --interface eth0:200.150.100.10/24"
+ echo " all args after the optional -- are passed to vserver <name> build <options>"
+ echo " typical usage is e.g. --interface eth0:200.150.100.10/24"
exit 1
}
[ -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
}