X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=e777822afd83449fecff5d967d7a7d431abb2e47;hb=a512c738f90c7325f13341b1e58ecc64f99299ea;hp=1c990c48534f695ee87b79c09240a8e93b32d1c4;hpb=90adf7e12b62615ab114dd64e11410d1c110150d;p=vserver-reference.git

diff --git a/build.sh b/build.sh
index 1c990c4..e777822 100755
--- a/build.sh
+++ b/build.sh
@@ -1,11 +1,18 @@
 #!/bin/bash
 #
-# Builds VServer reference image
+# Builds all reference image for vservers.  To optimize for space it
+# will only build a complete base vserver reference image and then
+# builds "stub" images that are just contain the additional files
+# and/or changes for a given reference image.  This is done to shrink
+# the RPM itself.  These will be pieced back together with the base
+# vserver reference image by an init script that is installed on the
+# node.
 #
 # Mark Huang <mlhuang@cs.princeton.edu>
-# Copyright (C) 2004-2006 The Trustees of Princeton University
+# Marc E. Fiuczynski <mef@cs.princeton.edu>
+# Copyright (C) 2004-2007 The Trustees of Princeton University
 #
-# $Id: build.sh,v 1.7 2006/03/29 20:26:41 mlhuang Exp $
+# $Id: build.sh,v 1.20 2007/09/06 20:41:23 faiyaza Exp $
 #
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
@@ -17,88 +24,79 @@ if [ -d ../build ] ; then
     PATH=$PATH:../build
     srcdir=..
 else
-    echo "Error: Could not find sources in either . or .."
+    echo "Error: Could not find $(cd .. && pwd -P)/build/"
     exit 1
 fi
 
 export PATH
 
-# Release and architecture to install
-releasever=2
-basearch=i386
-
-# Packages to install
-packagelist=(
-bash
-coreutils
-iputils
-kernel-vserver
-bzip2
-crontabs
-diffutils
-logrotate
-openssh-clients
-passwd
-rsh
-rsync
-sudo
-tcpdump
-telnet
-traceroute
-time
-vixie-cron
-wget
-yum
-curl
-gzip
-perl
-python
-tar
-)
-
-usage()
-{
-    echo "Usage: build.sh [OPTION]..."
-    echo "	-r release	Fedora release number (default: $releasever)"
-    echo "	-a arch		Fedora architecture (default: $basearch)"
-    echo "	-h		This message"
-    exit 1
-}
-
-# Get options
-while getopts "r:a:h" opt ; do
-    case $opt in
-	r)
-	    releasever=$OPTARG
-	    ;;
-	a)
-	    basearch=$OPTARG
-	    ;;
-	h|*)
-	    usage
-	    ;;
-    esac
-done
+# build.common comes from the build module
+. build.common
+
+pl_process_fedora_options $@
+shiftcount=$?
+shift $shiftcount
 
 # Do not tolerate errors
 set -e
 
-# Make /vservers
-vroot=$PWD/vservers/vserver-reference
-install -d -m 755 $vroot
+# Path's to the vserver references images and stubs
+vrefdir=$PWD/vservers/.vref
+vstubdir=$PWD/vservers/.vstub
 
-# Install vserver-reference system
-for package in "${packagelist[@]}" ; do
-    packages="$packages -p $package"
-done
-mkfedora -v -r $releasever -a $basearch $packages $vroot
+# XXX: The vserver reference name should be passed in as an argument
+# rather than being hardcoded.
+vrefname=default
+
+# Make /vservers and default vserver reference image
+vref=${vrefdir}/${vrefname}
+install -d -m 755 ${vref}
+
+# "Parse" out the packages and groups for mkfedora
+vrefpackages=$(grep "^package:.*" vserver-reference.lst | awk '{print $2}')
+vrefgroups=$(grep "^group:.*" vserver-reference.lst | awk '{print $2}')
+options=""
+for package in ${vrefpackages} ; do  options="$options -p $package"; done
+for group in ${vrefgroups} ; do options="$options -g $group"; done
+
+# Populate a minimal /dev in the reference image
+pl_makedevs ${vref}
+
+# Populate image with vserver-reference packages
+pl_setup_chroot ${vref} ${options}
 
-# Disable all services in reference image
-chroot $vroot sh -c "/sbin/chkconfig --list | awk '{ print \$1 }' | xargs -i /sbin/chkconfig {} off"
+for systemvserver in reference-vservers/*.lst ; do
+    NAME=$(basename $systemvserver .lst)
 
-# This tells the Boot Manager that it is okay to update
-# /etc/resolv.conf and /etc/hosts whenever the network configuration
-# changes. Users are free to delete this file.
-touch $vroot/etc/AUTO_UPDATE_NET_FILES
+    # "Parse" out the packages and groups for yum
+    systempackages=$(grep "^package:.*" $systemvserver | awk '{print $2}')
+    systemgroups=$(grep "^group:.*" $systemvserver | awk '{print $2}')
+
+    vdir=${vstubdir}/${NAME}
+    install -d -m 755 ${vdir}
+
+    # Clone the base vserver reference to the system vserver reference
+    # OPTIMIZATION: Consider using "cp -al" in the future
+    rsync -a ${vref}/ ${vdir}/
+    rm -f ${vdir}/var/lib/rpm/__db*
+
+    # Communicate to the initialization script from which vref this stub was cloned
+    echo ${vrefname} > ${vdir}.cloned
+
+    # Construct the excludes & includes patterns for rsync
+    (cd ${vdir} && find *) > ${vdir}.excludes
+    echo "var/lib/rpm/*" > ${vdir}.includes
+
+    # Install the system vserver specific packages
+    [ -n "$systempackages" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y install $systempackages
+    [ -n "$systemgroups" ] && yum -c ${vdir}/etc/yum.conf --installroot=${vdir} -y groupinstall $systemgroups
+
+    # Create a copy of the system vserver w/o the vserver reference files
+    mkdir -p ${vdir}-tmp/
+    rsync -a --include-from=${vdir}.includes --exclude-from=${vdir}.excludes ${vdir}/ ${vdir}-tmp/
+    rm -rf ${vdir}
+    rm -f ${vdir}.excludes ${vdir}.includes
+    mv ${vdir}-tmp ${vdir}
+done
 
 exit 0