builds myplc-native

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

diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index c97ce63..fbea5d1 100755 (executable)
--- a/vbuild-init-vserver.sh
+++ b/vbuild-init-vserver.sh
@@ -25,7 +25,13 @@ function configure_yum_in_vserver () {
     cd /etc/vservers/.distributions/${fcdistro}
     if [ -f yum/yum.conf ] ; then
        echo "Initializing yum.conf in $vserver from $(pwd)/yum"
-       cp yum/yum.conf /vservers/$vserver/etc/yum.conf
+        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
+
+       # post process the various @...@ variables from this yum.conf file.
     else
        echo "Cannot initialize yum.conf in $vserver - using $fcdistro default"
     fi
@@ -54,12 +60,13 @@ function setup_vserver () {
     # create the new vserver
     if [ ! -d /etc/vservers/$vserver ] ; then
        # check if we can create the vserver from a reference vserver
-       if [ -d /vservers/${fcdistro}_reference ] ; then
+       #if [ -d /vservers/${fcdistro}_reference ] ; then
+       if [ 0 -ne 0 ] ; then
            $personality vserver $VERBOSE $vserver build -m clone -- --source /vservers/${fcdistro}_reference
            CLONED=1
        else
            $personality vserver $VERBOSE $vserver build -m yum -- -d $fcdistro
-       fi
+        fi
     fi
 
     if [ ! -z "$personality" ] ; then
@@ -86,6 +93,7 @@ function setup_vserver () {
     $personality vserver $VERBOSE $vserver exec rm -f /var/lib/rpm/__db*
     $personality vserver $VERBOSE $vserver exec rpm --rebuilddb
 
+    # minimal config in the vserver for yum to work
     configure_yum_in_vserver $vserver $fcdistro
 
     # set up resolv.conf
@@ -153,6 +161,11 @@ function post_install () {
        fi
     fi
     
+    # customize root's prompt
+    cat << PROFILE > /root/.profile
+export PS1="[$vserver] \\w # "
+PROFILE
+
     uid=2000
     gid=2000