#!/bin/bash
# -*-shell-*-
+#shopt -s huponexit
+
COMMAND=$(basename $0)
DIRNAME=$(dirname $0)
-# lst parsing utilities
-PATH=$(dirname $0):$PATH . build.common
+# pkgs parsing utilities
+PATH=$(dirname $0):$PATH export PATH
+. build.common
+
+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}
- if [ -f yum/yum.conf ] ; then
- echo "Initializing yum.conf in $vserver from $(pwd)/yum"
+ templates=/etc/vservers/.distributions/${fcdistro}
+ if [ -f ${templates}/yum/yum.conf ] ; then
+ echo "Initializing yum.conf in $vserver from ${templates}/yum"
sed -e "s!@YUMETCDIR@!/etc!g;
s!@YUMCACHEDIR@!/var/cache/yum!g;
s!@YUMLOGDIR@!/var/log!g;
s!@YUMLOCKDIR@!/var/lock!g;
- " yum/yum.conf > /vservers/$vserver/etc/yum.conf
+ " ${templates}/yum/yum.conf > /vservers/$vserver/etc/yum.conf
# post process the various @...@ variables from this yum.conf file.
else
echo "Using $fcdistro default for yum.conf"
fi
- if [ -d yum.repos.d ] ; then
- echo "Initializing yum.repos.d in $vserver from $(pwd)/yum.repos.d"
+ if [ -d ${templates}/yum.repos.d ] ; then
+ echo "Initializing yum.repos.d in $vserver from ${templates}/yum.repos.d"
rm -rf /vservers/$vserver/etc/yum.repos.d
- tar cf - yum.repos.d | tar -C /vservers/$vserver/etc -xvf -
+ tar -C ${templates} -cf - yum.repos.d | tar -C /vservers/$vserver/etc -xvf -
else
echo "Cannot initialize yum.repos.d in $vserver"
fi
- if [ -n "$MYPLC_MODE" ] ; then
+ # for using vtest-init-vserver.sh as a general-purpose vserver creation wrapper
+ # just mention 'none' as the repo url
+ if [ -n "$MYPLC_MODE" -a "$REPO_URL" != "none" ] ; then
if [ ! -d /vservers/$vserver/etc/yum.repos.d ] ; then
echo "WARNING : cannot create myplc repo"
else
# exclude kernel from fedora repos
- for i in /vservers/$vserver/etc/yum.repos.d/* ; do
- echo "exclude=kernel* ulogd iptables" >> $i
+ for repo in /vservers/$vserver/etc/yum.repos.d/* ; do
+ [ -f $repo ] && yumconf_exclude $repo "exclude=$pl_KEXCLUDES"
done
# the build repo is not signed at this stage
cat > /vservers/$vserver/etc/yum.repos.d/myplc.repo <<EOF
EOF
fi
fi
- cd -
}
+# return yum or debootstrap
+function package_method () {
+ fcdistro=$1; shift
+ case $fcdistro in
+ f[0-9]*|centos[0-9]*|sl[0-9]*) echo yum ;;
+ lenny|etch) echo debootstrap ;;
+ *) echo Unknown distro $fcdistro ;;
+ esac
+}
+
+# return arch from debian distro and personality
+function canonical_arch () {
+ personality=$1; shift
+ fcdistro=$1; shift
+ case $(package_method $fcdistro) in
+ yum)
+ case $personality in *32) echo i386 ;; *64) echo x86_64 ;; *) echo Unknown-arch-1 ;; esac ;;
+ debootstrap)
+ case $personality in *32) echo i386 ;; *64) echo amd64 ;; *) echo Unknown-arch-2 ;; esac ;;
+ *)
+ echo Unknown-arch-3 ;;
+ esac
+}
+
+# the new test framework creates /timestamp in /vservers/<name> *before* populating it
+function almost_empty () {
+ dir="$1"; shift ;
+ # non existing is fine
+ [ ! -d $dir ] && return 0;
+ # need to have at most one file
+ count=$(cd $dir; ls | wc -l); [ $count -le 1 ];
+}
+
function setup_vserver () {
set -x
fcdistro=$1; shift
personality=$1; shift
- CLONED=0
- # create the new vserver
- if [ ! -d /etc/vservers/$vserver ] ; then
- # check if we can create the vserver from a reference vserver
- #if [ -d /vservers/${fcdistro}_reference ] ; then
- if [ 0 -ne 0 -a -n "$VBUILD_MODE" ] ; then
- $personality vserver $VERBOSE $vserver build -m clone -- --source /vservers/${fcdistro}_reference
- CLONED=1
- else
- $personality vserver $VERBOSE $vserver build -m yum -- -d $fcdistro
- fi
- fi
+ # check that this is a new one - see above
+ almost_empty /vservers/$vserver || {
+ echo "$COMMAND : vserver $vserver seems to exist - bailing out"
+ exit 1
+ }
+
+ pkg_method=$(package_method $fcdistro)
+ case $pkg_method in
+ yum)
+ build_options="-m yum -- -d $fcdistro"
+ ;;
+ debootstrap)
+ arch=$(canonical_arch $personality $fcdistro)
+ build_options="-m debootstrap -- -d $fcdistro -- --arch $arch"
+ ;;
+ *)
+ build_options="something wrong" ;;
+ esac
+
+ # create it
+ # 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 $build_options && break || true
+ echo "* ${i}-th attempt to 'vserver build' failed - waiting for 3 seconds"
+ sleep 3
+ done
+ # check success - not enough to check for the directory, let's assume /etc/ in image
+ [ -d /vservers/$vserver/etc ]
if [ ! -z "$personality" ] ; then
- l32=$(grep $personality /etc/vservers/$vserver/personality | wc -l)
- [ $l32 -eq 0 ] && echo $personality >> /etc/vservers/$vserver/personality
+ 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
+ BCAPFILE=/etc/vservers/$vserver/bcapabilities
+ touch $BCAPFILE
if [ -n "$VBUILD_MODE" ] ; then
- # 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_SYS_ADMIN' >> /etc/vservers/$vserver/bcapabilities
- cap=$(grep ^CAP_MKNOD /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
+ ### capabilities required for a build vserver
+ # set up appropriate vserver capabilities to mount, mknod and IPC_LOCK
+ grep -q ^CAP_SYS_ADMIN $BCAPFILE || echo CAP_SYS_ADMIN >> $BCAPFILE
+ grep -q ^CAP_MKNOD $BCAPFILE || echo CAP_MKNOD >> $BCAPFILE
+ grep -q ^CAP_IPC_LOCK $BCAPFILE || echo CAP_IPC_LOCK >> $BCAPFILE
+ # useful for f16 guests that use set_cap_file
+ grep -q ^CAP_SETFCAP $BCAPFILE || echo CAP_SETFCAP >> $BCAPFILE
+ else
+ ### capabilities required for a myplc vserver
+ # for /etc/plc.d/gpg - need to init /dev/random
+ grep -q ^CAP_MKNOD $BCAPFILE || echo CAP_MKNOD >> $BCAPFILE
+ grep -q ^CAP_NET_BIND_SERVICE $BCAPFILE || echo CAP_NET_BIND_SERVICE >> $BCAPFILE
+ # useful for f16 guests that use set_cap_file
+ grep -q ^CAP_SETFCAP $BCAPFILE || echo CAP_SETFCAP >> $BCAPFILE
fi
- # start the vserver so we can do the following operations
- if [ $CLONED -eq 0 ] ; then
+ # Set persistent for the network context
+ # Thierry: Daniel's kernels come with single_ip turned off by default, let's make this explicit
+ echo "persistent,lback_allow,~single_ip" > /etc/vservers/$vserver/nflags
+
+ # Set cflags
+ echo -e "persistent\n~info_init" > /etc/vservers/$vserver/cflags
+
+ # Enable cgroup
+ mkdir /etc/vservers/$vserver/cgroup
+
+ # Set the init style of your vserver to plain for f16 and higher
+ # not working with f16 anyways, systemd requires 2.6.36 to work
+ case $fcdistro in
+ f1[5-9]) echo plain > /etc/vservers/$vserver/apps/init/style ;;
+ esac
+
+ if [ "$pkg_method" = "yum" ] ; then
$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
+ fi
+
+ # 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
+
+ if [ "$pkg_method" == "yum" ] ; then
+ $personality vserver $VERBOSE $vserver exec sh -c "rm -f /var/lib/rpm/__db*"
+
+ # run the host rpmdb_dump and restore with the guest rpmdb_load
+ function translate_rpm_hashes () {
+ set -x
+ set -e
+ local personality="$1"; shift
+ local vserver="$1"; shift
+ # need to have utilities installed
+ type -p file
+ type -p awk
+ type -p cut
+ guest_dir=/var/lib/rpm
+ host_dir=/vservers/$vserver/$guest_dir
+ files=$(cd $host_dir ; file * | grep Hash | cut -d: -f 1)
+ for file in $files; do
+ (cd $host_dir && mv $file ${file}-foreign)
+ /usr/lib/rpm/rpmdb_dump $host_dir/${file}-foreign | $personality vserver $VERBOSE $vserver exec /usr/lib/rpm/rpmdb_load $guest_dir/$file
+ done
+ $personality vserver $VERBOSE $vserver exec rpm --rebuilddb
+ return 0
+ }
+
+ # 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
fi
- $personality vserver $VERBOSE $vserver start
- $personality vserver $VERBOSE $vserver exec rm -f /var/lib/rpm/__db*
- $personality vserver $VERBOSE $vserver exec rpm --rebuilddb
+ # check if the vserver kernel is using VSERVER_DEVICE (vdevmap) support
+ need_vdevmap=$(grep "CONFIG_VSERVER_DEVICE=y" /boot/config-$(uname -r) | wc -l)
+
+ if [ $need_vdevmap -eq 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
+ fi
+
# minimal config in the vserver for yum to work
- configure_yum_in_vserver $vserver $fcdistro
+ [ "$pkg_method" = "yum" ] && 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
+ pkg_method=$(package_method $fcdistro)
+
+ # check for .pkgs file based on pldistro
if [ -n "$VBUILD_MODE" ] ; then
- lst=${pldistro}-devel.lst
+ pkgsname=devel.pkgs
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"
- 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)
+ ### install individual packages, then groups
+ # get target arch - use uname -i here (we want either x86_64 or i386)
+ vserver_arch=$($personality vserver $vserver exec uname -i)
+ # on debian systems we get arch through the 'arch' command
+ [ "$vserver_arch" = "unknown" ] && vserver_arch=$($personality vserver $vserver exec arch)
+
+ packages=$(pl_getPackages -a $vserver_arch $fcdistro $pldistro $pkgsfile)
+ groups=$(pl_getGroups -a $vserver_arch $fcdistro $pldistro $pkgsfile)
+
+ case "$pkg_method" in
+ yum)
+ [ -n "$packages" ] && $personality vserver $vserver exec yum -y install $packages
+ for group_plus in $groups; do
+ group=$(echo $group_plus | sed -e "s,+++, ,g")
+ $personality vserver $vserver exec yum -y groupinstall "$group"
+ done
+ # store current rpm list in /init-vserver.rpms in case we need to check the contents
+ $personality vserver $vserver exec rpm -aq > /vservers/$vserver/init-vserver.rpms
+ ;;
+ debootstrap)
+ $personality vserver $vserver exec apt-get update
+ for package in $packages ; do
+ $personality vserver $vserver exec apt-get install -y $package
+ done
+ ### xxx todo install groups with apt..
+ ;;
+ *)
+ echo "unknown pkg_method $pkg_method"
+ ;;
+ esac
- [ -n "$packages" ] && $personality vserver $vserver exec yum -y install $packages
- [ -n "$groups" ] && $personality vserver $vserver exec yum -y groupinstall $groups
return 0
}
else
post_install_myplc "$@"
fi
+ # setup localtime from the host
+ vserver=$1; shift
+ cp /etc/localtime /vservers/$vserver/etc/localtime
}
function post_install_vbuild () {
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 /etc/sysconfig/network if missing
+ [ -f /etc/sysconfig/network ] || echo NETWORKING=yes > /etc/sysconfig/network
+
+ # create symlink for /dev/fd
+ [ ! -e "/dev/fd" ] && ln -s /proc/self/fd /dev/fd
+
+ # turn off regular crond, as plc invokes plc_crond
+ chkconfig crond off
+
+ # take care of loginuid in /etc/pam.d
+ sed -i "s,#*\(.*loginuid.*\),#\1," /etc/pam.d/*
+
# 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 [-s|s|p] [-v] vserver-name distribution pldistro [personality]"
- echo "Usage: $COMMAND_MYPLC [-s|s|p] [-v] vserver-name distribution pldistro repo-url [personality]"
+ 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"
- echo " . vserver-name : the vserver's name"
- echo " . distribution : for creating the root filesystem, e.g. fc6"
- echo " . pldistro: e.g. onelab"
- echo " . repo-url: for myplc vserver, used to create a yum repository"
- echo " . personality: last, optional, argument defaults to linux32"
- echo "This is done in three steps"
- echo " (*) setup phase : vserver creation, yum internalization and config (from /etc/vservers)"
- echo " (*) tools install the tools required for building are installed"
- echo " based on the folowing file for the actual set of packages and groups"
- echo " vbuild mode : <pldistro>-devel.lst"
- echo " myplc mode : <pldistro>-shell.lst"
- echo " (*) post-install : various tunings required, as well as create a build user (vbuild only)"
- echo "Options:"
- echo " -s : skips the setup phase"
- echo " -t : skips the tools phase"
- echo " -p : skips the post-install"
- echo " -v : passes -v to calls to vserver"
+ 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 " -i ifname: determines ip and netmask attached to ifname, and passes it to the vserver"
+ echo " -r : set apps/init/mark to default so the vserver restart upon reboot"
+ 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 "With $COMMAND_MYPLC you can give 'none' as the URL, in which case"
+ echo " myplc.repo does not get created"
exit 1
}
usage ;;
esac
- DO_SETUP=true
- DO_TOOLS=true
- DO_POST=true
VERBOSE=
- while getopts "stpvh" opt ; do
+ RESISTANT=""
+ IFNAME=""
+ VSERVER_OPTIONS=""
+ while getopts "f:d:p:i:rv" opt ; do
case $opt in
- s) DO_SETUP="" ;;
- t) DO_TOOLS="" ;;
- p) DO_POST="" ;;
+ f) fcdistro=$OPTARG;;
+ d) pldistro=$OPTARG;;
+ p) personality=$OPTARG;;
+ i) IFNAME=$OPTARG;;
+ r) RESISTANT="true";;
v) VERBOSE="-v" ;;
- h|*) usage ;;
+ *) usage ;;
esac
done
shift $(($OPTIND - 1))
-
+
+ # parse fixed arguments
[[ -z "$@" ]] && usage
vserver=$1 ; shift
- [[ -z "$@" ]] && usage
- fcdistro=$1 ; shift
- [[ -z "$@" ]] && usage
- pldistro=$1 ; shift
if [ -n "$MYPLC_MODE" ] ; then
[[ -z "$@" ]] && usage
REPO_URL=$1 ; shift
fi
- if [[ -z "$@" ]] ; then
- personality=linux32
- else
- personality=$1; shift
+
+ # parse vserver options
+ if [[ -n "$@" ]] ; then
+ if [ "$1" == "--" ] ; then
+ shift
+ VSERVER_OPTIONS="$@"
+ else
+ usage
+ fi
fi
- [[ -n "$@" ]] && usage
- [ -n "$DO_SETUP" ] && setup_vserver $vserver $fcdistro $personality
- [ -n "$DO_TOOLS" ] && devel_tools $vserver $fcdistro $pldistro $personality
- [ -n "$DO_POST" ] && post_install $vserver $personality
+ # 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_or_vtest_tools $vserver $fcdistro $pldistro $personality
+ post_install $vserver $personality
+
+ # Start Vserver automatically on boot
+ [ -n "$RESISTANt" ] && echo "default" > /etc/vservers/$vserver/apps/init/mark
+ echo $COMMAND Done
}
main "$@"
git://git.onelab.eu / build.git / blobdiff