COMMAND=$(basename $0)
DIRNAME=$(dirname $0)
-# lst parsing utilities
+# pkgs parsing utilities
PATH=$(dirname $0):$PATH . build.common
-DEFAULT_FCDISTRO=f7
+DEFAULT_FCDISTRO=f8
DEFAULT_PLDISTRO=planetlab
DEFAULT_PERSONALITY=linux32
+DEFAULT_IFNAME=eth0
+
+COMMAND_VBUILD="vbuild-init-vserver.sh"
+COMMAND_MYPLC="vtest-init-vserver.sh"
function failure () {
echo "$COMMAND : Bailing out"
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 () {
fi
# create it
- options=""
- [ -n "$IP_ADDR" ] && options="$options --interface $IP_ADDR"
- [ -n "$HOSTNAME" ] && options="$options --hostname $HOSTNAME"
- [ -n "$NET_DEV" ] && options="$options --netdev $NET_DEV"
- $personality vserver $VERBOSE $vserver build $options -m yum -- -d $fcdistro
+ # try to work around the vserver issue:
+ # vc_ctx_migrate: No such process
+ # rpm-fake.so: failed to initialize communication with resolver
+ for i in $(seq 20) ; do
+ $personality vserver $VERBOSE $vserver build $VSERVER_OPTIONS -m yum -- -d $fcdistro && break || true
+ echo "* ${i}-th attempt to 'vserver build' failed - waiting for 3 seconds"
+ sleep 3
+ done
+ # check success
+ [ -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 $(seq 20) ; do
+ $personality vserver $VERBOSE $vserver pkgmgmt internalize && break || true
+ echo "* ${i}-th attempt to 'vserver pkgmgmt internalize' failed - waiting for 3 seconds"
+ sleep 3
+ 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
pldistro=$1; shift
personality=$1; shift
- # check for .lst file based on pldistro
+ # check for .pkgs file based on pldistro
if [ -n "$VBUILD_MODE" ] ; then
- lst=${pldistro}-devel.lst
- else
- lst=${pldistro}-shell.lst
- fi
- if [ -f $lst ] ; then
- echo "$COMMAND: Using $lst"
- elif [ -f $DIRNAME/$lst ] ; then
- lst=$DIRNAME/$lst
- echo "$COMMAND: Using $lst"
+ pkgsname=devel.pkgs
else
- echo "$COMMAND : Cannot locate $lst - exiting"
- usage
+ pkgsname=vtest.pkgs
fi
+ pkgsfile=$(pl_locateDistroFile $DIRNAME $pldistro $pkgsname)
# install individual packages, then groups
- packages=$(pl_getPackages2 ${fcdistro} $lst)
- groups=$(pl_getGroups2 ${fcdistro} $lst)
+ 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 # "
EOF
}
-COMMAND_VBUILD="vbuild-init-vserver.sh"
-COMMAND_MYPLC="myplc-init-vserver.sh"
+# parses ifconfig's output to find out ip address and mask
+# will then be passed to vserver as e.g. --interface 138.96.250.126/255.255.0.0
+# default is to use lo, that's enough for local mirrors
+# use -i eth0 in case your fedora mirror is on a separate box on the network
+function vserverIfconfig () {
+ ifname=$1; shift
+ local result=""
+ line=$(ifconfig $ifname 2> /dev/null | grep 'inet addr')
+ if [ -n "$line" ] ; then
+ set $line
+ for word in "$@" ; do
+ addr=$(echo $word | sed -e s,[aA][dD][dD][rR]:,,)
+ mask=$(echo $word | sed -e s,[mM][aA][sS][kK]:,,)
+ if [ "$word" != "$addr" ] ; then
+ result="${addr}"
+ elif [ "$word" != "$mask" ] ; then
+ result="${result}/${mask}"
+ fi
+ done
+ fi
+ if [ -z "$result" ] ; then
+ echo "vserverIfconfig failed to locate $ifname"
+ exit 1
+ else
+ echo $result
+ fi
+}
+
function usage () {
set +x
- echo "Usage: $COMMAND_VBUILD [-v] vserver-name"
- echo "Usage: $COMMAND_MYPLC [-v] vserver-name repo-url"
+ 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 "$COMMAND_MYPLC only:"
- echo " -h hostname: passed as vserver build --hostname"
- echo " -i ip-address: passed as vserver build --interface"
- echo " -e dev: passed as vserver build --netdev"
+ echo " -i ifname: determines ip and netmask attached to ifname, and passes it to the 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"
exit 1
}
esac
VERBOSE=
- while getopts "f:d:p:vu:h:i:e:" opt ; do
+ IFNAME=""
+ VSERVER_OPTIONS=""
+ while getopts "f:d:p:i:v" opt ; do
case $opt in
f) fcdistro=$OPTARG;;
d) pldistro=$OPTARG;;
p) personality=$OPTARG;;
- i) [ -z "$MYPLC_MODE" ] && usage ; IP_ADDR=$OPTARG;;
- h) [ -z "$MYPLC_MODE" ] && usage ; HOSTNAME=$OPTARG;;
- e) [ -z "$MYPLC_MODE" ] && usage ; NET_DEV==$OPTARG;;
+ i) IFNAME=$OPTARG;;
v) VERBOSE="-v" ;;
*) usage ;;
esac
done
shift $(($OPTIND - 1))
+
+ # parse fixed arguments
[[ -z "$@" ]] && usage
vserver=$1 ; shift
if [ -n "$MYPLC_MODE" ] ; then
[[ -z "$@" ]] && usage
REPO_URL=$1 ; shift
fi
- [[ -n "$@" ]] && usage
+
+ # parse vserver options
+ if [[ -n "$@" ]] ; then
+ if [ "$1" == "--" ] ; then
+ shift
+ VSERVER_OPTIONS="$@"
+ else
+ usage
+ fi
+ fi
+
+ # with new util-vserver, it is mandatory to provide an IP even for building
+ if [ -n "$VBUILD_MODE" ] ; then
+ [ -z "$IFNAME" ] && IFNAME=$DEFAULT_IFNAME
+ fi
+ if [ -n "$IFNAME" ] ; then
+ localip=$(vserverIfconfig $IFNAME)
+ VSERVER_OPTIONS="$VSERVER_OPTIONS --interface $localip"
+ fi
[ -z "$fcdistro" ] && fcdistro=$DEFAULT_FCDISTRO
[ -z "$pldistro" ] && pldistro=$DEFAULT_PLDISTRO
[ -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
}