git://git.onelab.eu
/
bootmanager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d5b5cfd
)
use build/build.common functions
author
Marc Fiuczynski
<mef@cs.princeton.edu>
Fri, 31 Aug 2007 02:29:35 +0000
(
02:29
+0000)
committer
Marc Fiuczynski
<mef@cs.princeton.edu>
Fri, 31 Aug 2007 02:29:35 +0000
(
02:29
+0000)
support-files/buildnode.sh
patch
|
blob
|
history
diff --git
a/support-files/buildnode.sh
b/support-files/buildnode.sh
index
3a36962
..
07b0600
100755
(executable)
--- 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
#
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2005-2006 The Trustees of Princeton University
#
-# $Id: buildnode.sh,v 1.12
2006/08/11 13:04:03 thierry
Exp $
+# $Id: buildnode.sh,v 1.12
.6.1 2007/08/30 20:09:20 mef
Exp $
#
PATH=/sbin:/bin:/usr/sbin:/usr/bin
#
PATH=/sbin:/bin:/usr/sbin:/usr/bin
@@
-24,33
+24,11
@@
fi
export PATH
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
# 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.
# 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
echo "* Disabling unnecessary services"
for service in netfs rawdevices cpuspeed smartd ; do
if [ -x $VROOT/etc/init.d/$service ] ; then