reviewed options:

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

diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index 8545973..5bf728a 100755 (executable)
--- a/vbuild-init-vserver.sh
+++ b/vbuild-init-vserver.sh
@@ -2,6 +2,7 @@
 # -*-shell-*-
 
 COMMAND=$(basename $0)
+DIRNAME=$(dirname $0)
 
 # lst parsing utilities
 PATH=$(dirname $0):$PATH . build.common
@@ -21,7 +22,6 @@ function configure_yum_in_vserver () {
 
     vserver=$1; shift
     fcdistro=$1; shift
-    repo_url=$1; shift
 
     cd /etc/vservers/.distributions/${fcdistro}
     if [ -f yum/yum.conf ] ; then
@@ -49,11 +49,17 @@ function configure_yum_in_vserver () {
        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
+           done
+           # the build repo is not signed at this stage
            cat > /vservers/$vserver/etc/yum.repos.d/myplc.repo <<EOF
 [myplc]
 name= MyPLC
-baseurl=$repo_url
+baseurl=$REPO_URL
 enabled=1
+gpgcheck=0
 EOF
        fi
     fi
@@ -110,7 +116,7 @@ function setup_vserver () {
     $personality vserver $VERBOSE $vserver exec rpm --rebuilddb
 
     # minimal config in the vserver for yum to work
-    configure_yum_in_vserver $vserver $fcdistro $repo_url
+    configure_yum_in_vserver $vserver $fcdistro 
 
     # set up resolv.conf
     cp /etc/resolv.conf /vservers/$vserver/etc/resolv.conf
@@ -135,6 +141,9 @@ function devel_tools () {
     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
@@ -305,7 +314,7 @@ function main () {
     pldistro=$1 ; shift
     if [ -n "$MYPLC_MODE" ] ; then
        [[ -z "$@" ]] && usage
-       repo_url=$1 ; shift
+       REPO_URL=$1 ; shift
     fi
     if [[ -z "$@" ]] ; then
        personality=linux32
@@ -314,7 +323,7 @@ function main () {
     fi
     [[ -n "$@" ]] && usage
 
-    [ -n "$DO_SETUP" ] && setup_vserver $vserver $fcdistro $personality
+    [ -n "$DO_SETUP" ] && setup_vserver $vserver $fcdistro $personality 
     [ -n "$DO_TOOLS" ] && devel_tools $vserver $fcdistro $pldistro $personality
     [ -n "$DO_POST" ] && post_install $vserver $personality