From 63055d6a62c7b5c3b907c4044508f15f58492ae7 Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Thu, 30 Aug 2007 16:39:09 +0000 Subject: [PATCH] modified to use common functions from build/build.common --- prep.sh | 36 ++++-------------------------------- 1 file changed, 4 insertions(+), 32 deletions(-) diff --git a/prep.sh b/prep.sh index 883e10f..1880986 100755 --- a/prep.sh +++ b/prep.sh @@ -8,7 +8,7 @@ # Mark Huang # Copyright (C) 2004-2006 The Trustees of Princeton University # -# $Id: prep.sh,v 1.12 2006/08/21 20:24:09 mlhuang Exp $ +# $Id: prep.sh,v 1.13 2006/08/21 20:45:23 mlhuang Exp $ # PATH=/sbin:/bin:/usr/sbin:/usr/bin @@ -26,9 +26,7 @@ fi export PATH -# Release and architecture to install -releasever=4 -basearch=i386 +. build.common # Packages to install packagelist=( @@ -109,30 +107,6 @@ usr/share/zoneinfo/UTC usr/lib/locale/en_US.utf8 ) -usage() -{ - echo "Usage: prep.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 - # Do not tolerate errors set -e @@ -147,7 +121,8 @@ rpmquery --specfile bootcd.spec --queryformat '%{VERSION}\n' | head -1 >build/ve for package in "${packagelist[@]}" ; do packages="$packages -p $package" done -mkfedora -v -r $releasever -a $basearch -k $packages $bootcd + +pl_setup_chroot $bootcd $packages pushd $bootcd @@ -165,9 +140,6 @@ rm -f precious.tar popd -# Disable all services in reference image -chroot $bootcd sh -c "/sbin/chkconfig --list | awk '{ print \$1 }' | xargs -i /sbin/chkconfig {} off" - # Install ipnmac (for SuperMicro machines with IPMI) echo "* Installing IPMI utilities" install -D -m 755 ipnmac/ipnmac.x86 $bootcd/usr/sbin/ipnmac -- 2.43.0