From d4d0ed903d63a4b9728f07b2429264389f59bbb1 Mon Sep 17 00:00:00 2001
From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Thu, 30 Aug 2007 20:09:20 +0000
Subject: [PATCH] use build/build.common to use common build operations

---
 support-files/buildnode.sh | 48 +++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 29 deletions(-)

diff --git a/support-files/buildnode.sh b/support-files/buildnode.sh
index 78b7e0c..71b076d 100755
--- a/support-files/buildnode.sh
+++ b/support-files/buildnode.sh
@@ -6,7 +6,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2005-2006 The Trustees of Princeton University
 #
-# $Id: buildnode.sh,v 1.11 2006/05/18 18:42:33 mlhuang Exp $
+# $Id: buildnode.sh,v 1.13 2007/08/30 20:08:25 mef Exp $
 #
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
@@ -24,33 +24,11 @@ fi
 
 export PATH
 
-# Release and architecture to install
-releasever=4
-basearch=i386
+. build.common
 
-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
+pl_process_fedora_options $@
+shiftcount=$?
+shift $shiftcount
 
 # Do not tolerate errors
 set -e
@@ -73,9 +51,21 @@ export PL_BOOTCD=1
 # because groupinstall does not honor Requires(pre) dependencies
 # properly, most %pre scripts require coreutils to be installed first,
 # and some of our %post scripts require python.
-mkfedora -v -r $releasever -a $basearch -k -p udev -p coreutils -p python -g PlanetLab $VROOT
 
-# Disable unnecessary services
+packagelist=(
+udev
+coreutils
+python
+)
+# vserver-reference packages used for reference image
+for package in "${packagelist[@]}" ; do
+    packages="$packages -p $package"
+done
+
+# Populate VROOT with the files for the PlanetLab-Bootstrap content
+pl_setup_chroot $VROOT -k $packages -g PlanetLab
+
+# Disable additional unnecessary services
 echo "* Disabling unnecessary services"
 for service in netfs rawdevices cpuspeed smartd ; do
     if [ -x $VROOT/etc/init.d/$service ] ; then
-- 
2.43.0