X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vbuild-init-vserver.sh;h=fb26d440a20a52b4f91d209bbc7f171647aee8e3;hb=bd47e7d76e1e87bb48de82c61fe00f73e77fbf9d;hp=4c71dd237bcac82795469deeaa78d1cb88e1bbaa;hpb=ce044b510afbe1bcc830501fcc1f5505fcb57e8c;p=build.git

diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index 4c71dd23..fb26d440 100755
--- a/vbuild-init-vserver.sh
+++ b/vbuild-init-vserver.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 # -*-shell-*-
-# $Id$
 
 #shopt -s huponexit
 
@@ -8,7 +7,8 @@ COMMAND=$(basename $0)
 DIRNAME=$(dirname $0)
 
 # pkgs parsing utilities
-PATH=$(dirname $0):$PATH . build.common
+PATH=$(dirname $0):$PATH export PATH
+. build.common
 
 DEFAULT_FCDISTRO=f8
 DEFAULT_PLDISTRO=planetlab
@@ -56,7 +56,9 @@ function configure_yum_in_vserver () {
 	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
@@ -171,6 +173,23 @@ function setup_vserver () {
 	[ $cap -eq 0 ] && echo 'CAP_NET_BIND_SERVICE' >> /etc/vservers/$vserver/bcapabilities
     fi
 
+    # Set persistent for the network context
+    echo persistent,lback_allow > /etc/vservers/$vserver/nflags
+
+    # Set cflags
+    echo -e "persistent\n~info_init" > /etc/vservers/$vserver/cflags
+
+    # Enable cgroup
+    mkdir /etc/vservers/$vserver/cgroup
+
+    # Start Vserver automatically on boot
+    echo "default" > /etc/vservers/$vserver/apps/init/mark
+
+    # Set the init style of your vserver to plain for f13
+    case $fcdistro in 
+	f13|f14) echo plain > /etc/vservers/$vserver/apps/init/style ;;
+    esac
+
     if [ "$pkg_method" = "yum" ] ; then
 	$personality vyum $vserver -- -y install yum
         # ditto
@@ -182,15 +201,37 @@ function setup_vserver () {
     fi
 
     # start the vserver so we can do the following operations
-#    rm -f /tmp/go*
-#    echo -n ' about to start - WAITING for /tmp/go1' ; while true ; do [ -f /tmp/go1 ] && break || : ; done
-    $personality vserver $VERBOSE $vserver start
-#    echo -n ' started - WAITING for /tmp/go2' ; while true ; do [ -f /tmp/go2 ] && break || : ; done
-#if true ; then 
-#    echo SKIPPING for debug --- vserver was started
-#else
-    [ "$pkg_method" = "yum" ] && $personality vserver $VERBOSE $vserver exec sh -c "rm -f /var/lib/rpm/__db*"
-    [ "$pkg_method" = "yum" ] && $personality vserver $VERBOSE $vserver exec rpm --rebuilddb
+    # 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
 
     # check if the vserver kernel is using VSERVER_DEVICE (vdevmap) support
     need_vdevmap=$(grep "CONFIG_VSERVER_DEVICE=y" /boot/config-$(uname -r) | wc -l)
@@ -209,8 +250,6 @@ function setup_vserver () {
     # and /etc/hosts for at least localhost
     [ -f /vservers/$vserver/etc/hosts ] || echo "127.0.0.1 localhost localhost.localdomain" > /vservers/$vserver/etc/hosts
 
-#fi
-
 }
 
 function devel_or_vtest_tools () {
@@ -244,7 +283,10 @@ function devel_or_vtest_tools () {
     groups=$(pl_getGroups -a $vserver_arch $fcdistro $pldistro $pkgsfile)
 
     [ "$pkg_method" = yum ] && [ -n "$packages" ] && $personality vserver $vserver exec yum -y install $packages
-    [ "$pkg_method" = yum ] && [ -n "$groups" ] && $personality vserver $vserver exec yum -y groupinstall $groups
+    [ "$pkg_method" = yum ] && for group_plus in $groups; do
+	group=$(echo $group_plus | sed -e "s,+++, ,g")
+        $personality vserver $vserver exec yum -y groupinstall "$group"
+    done
 
     [ "$pkg_method" = debootstrap ] && $personality vserver $vserver exec apt-get update
     [ "$pkg_method" = debootstrap ] && for package in $packages ; do 
@@ -401,6 +443,8 @@ function usage () {
     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
 }