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

diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index 04cc3d4b..4c71dd23 100755
--- a/vbuild-init-vserver.sh
+++ b/vbuild-init-vserver.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 # -*-shell-*-
+# $Id$
+
+#shopt -s huponexit
 
 COMMAND=$(basename $0)
 DIRNAME=$(dirname $0)
@@ -31,24 +34,24 @@ 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
@@ -58,8 +61,8 @@ function configure_yum_in_vserver () {
 	    echo "WARNING : cannot create myplc repo"
 	else
             # exclude kernel from fedora repos 
-	    for i in /vservers/$vserver/etc/yum.repos.d/* ; do
-		[ -f $i ] && 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
@@ -71,9 +74,32 @@ gpgcheck=0
 EOF
 	fi
     fi
-    popd
 }    
 
+# return yum or debootstrap
+function package_method () {
+    fcdistro=$1; shift
+    case $fcdistro in
+	f[0-9]*|centos[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
+}
+
 function setup_vserver () {
 
     set -x
@@ -89,12 +115,25 @@ function setup_vserver () {
 	exit 1
     fi
 
+    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 -m yum -- -d $fcdistro && break || true
+	$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
@@ -132,54 +171,46 @@ function setup_vserver () {
 	[ $cap -eq 0 ] && echo 'CAP_NET_BIND_SERVICE' >> /etc/vservers/$vserver/bcapabilities
     fi
 
-    $personality vyum $vserver -- -y install yum
-    # 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
+    if [ "$pkg_method" = "yum" ] ; then
+	$personality vyum $vserver -- -y install yum
+        # 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
+#    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
-    $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
+#    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
+
+    # 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
+
+#fi
+
 }
 
 function devel_or_vtest_tools () {
@@ -193,6 +224,8 @@ function devel_or_vtest_tools () {
     pldistro=$1; shift
     personality=$1; shift
 
+    pkg_method=$(package_method $fcdistro)
+
     # check for .pkgs file based on pldistro
     if [ -n "$VBUILD_MODE" ] ; then
 	pkgsname=devel.pkgs
@@ -201,12 +234,23 @@ function devel_or_vtest_tools () {
     fi
     pkgsfile=$(pl_locateDistroFile $DIRNAME $pldistro $pkgsname)
 
-    # install individual packages, then groups
-    packages=$(pl_getPackages $fcdistro $pldistro $pkgsfile)
-    groups=$(pl_getGroups $fcdistro $pldistro $pkgsfile)
+    ### 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)
+
+    [ "$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
 
-    [ -n "$packages" ] && $personality vserver $vserver exec yum -y install $packages
-    [ -n "$groups" ] && $personality vserver $vserver exec yum -y groupinstall $groups
+    [ "$pkg_method" = debootstrap ] && $personality vserver $vserver exec apt-get update
+    [ "$pkg_method" = debootstrap ] && for package in $packages ; do 
+	$personality vserver $vserver exec apt-get install -y $package 
+    done
+    
     return 0
 }
 
@@ -218,7 +262,7 @@ function post_install () {
     fi
     # setup localtime from the host
     vserver=$1; shift 
-    cp /etc/localtime /vserver/$vserver/etc/localtime
+    cp /etc/localtime /vservers/$vserver/etc/localtime
 }
 
 function post_install_vbuild () {
@@ -292,9 +336,18 @@ function post_install_myplc  () {
 # 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 # "