unsupported combination of vserver & util-vserver

[build.git] / vbuild-init-vserver.sh

diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index cec08df..7bfb644 100755 (executable)
--- a/vbuild-init-vserver.sh
+++ b/vbuild-init-vserver.sh
@@ -98,7 +98,11 @@ function setup_vserver () {
     [ -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
@@ -120,24 +124,59 @@ function setup_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 1 2 3 4 5 ; do
+       $personality vserver $VERBOSE $vserver pkgmgmt internalize && break || true
+       echo "Waiting for one minute"
+       sleep 60
+    done
 
     # start the vserver so we can do the following operations
     $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 our environment"
+           exit 1
+#          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 
@@ -157,8 +196,8 @@ function devel_tools () {
     pkgsfile=$(pl_locateDistroFile $DIRNAME $pldistro $pkgsname)
 
     # install individual packages, then groups
-    packages=$(pl_getPackages ${fcdistro} $pkgsfile)
-    groups=$(pl_getGroups ${fcdistro} $pkgsfile)
+    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
@@ -191,7 +230,7 @@ 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
@@ -244,6 +283,9 @@ 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 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 # "
@@ -324,7 +366,7 @@ function main () {
     [ -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
 
 }