X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vbuild-init-vserver.sh;h=843ebe96103cb699506d1303fab25f8f510219e6;hb=f5cab4881fdf442e53eca4b697753f440e937e00;hp=5e3acd5affb80449d86efd186d7e55f734c4b62e;hpb=ea59599964f3eab6a2e3ebf436a45654b0b8626c;p=build.git

diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index 5e3acd5a..843ebe96 100755
--- a/vbuild-init-vserver.sh
+++ b/vbuild-init-vserver.sh
@@ -1,14 +1,16 @@
 #!/bin/bash
 # -*-shell-*-
-# $Id$
+
+#shopt -s huponexit
 
 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=centos5
+DEFAULT_FCDISTRO=f8
 DEFAULT_PLDISTRO=planetlab
 DEFAULT_PERSONALITY=linux32
 DEFAULT_IFNAME=eth0
@@ -32,29 +34,31 @@ function configure_yum_in_vserver () {
     vserver=$1; shift
     fcdistro=$1; shift
 
-    pushd /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
@@ -72,7 +76,6 @@ gpgcheck=0
 EOF
 	fi
     fi
-    popd
 }    
 
 # return yum or debootstrap
@@ -170,6 +173,14 @@ 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 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
@@ -181,17 +192,42 @@ function setup_vserver () {
     fi
 
     # start the vserver so we can do the following operations
-    $personality vserver $VERBOSE $vserver start
-    [ "$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
+	}
 
-    # 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 ))
+	# 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)
 
-    if [ "$need_vdevmap" == 1 ] ; then
+    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
@@ -204,6 +240,7 @@ function setup_vserver () {
     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_or_vtest_tools () {
@@ -237,7 +274,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 
@@ -338,6 +378,9 @@ function post_install_myplc  () {
     # 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 # "
@@ -391,6 +434,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
 }