# Marc E. Fiuczynski <mef@cs.princeton.edu>
# Copyright (C) 2007 The Trustees of Princeton University
#
-# $Id:$
+# $Id: build.common,v 1.2 2007/08/31 02:20:54 mef Exp $
#
function pl_getDefaultFedoraRelease() {
fedoraRelease=$(awk ' { if ($2=="Core") print $4; else print $3 } ' /etc/fedora-release)
[ $fedoraRelease -lt $defaultFedoraRelease ] && fedoraRelease=$defaultFedoraRelease
else
- fedoraRelease=defaultFedoraRelease
+ fedoraRelease=$defaultFedoraRelease
fi
return $fedoraRelease
}
# let mkfedora select one of its mirrors
pl_FEDORA_URL=""
-pl_getDefaultFedoraRelease
+pl_getFedoraRelease
pl_FEDORA_RELEASE=$?
# get patch to appropriate yumgroups.xml file
[ -n "$pl_FEDORA_ARCH" ] && options="$options -a $pl_FEDORA_ARCH"
[ -n "$pl_FEDORA_RELEASE" ] && options="$options -r $pl_FEDORA_RELEASE"
# echo "mkfedora -v $options $root"
- eval ./mkfedora -v $options $root
+ eval mkfedora -v $options $root
}
function pl_setup_chroot() {
root=$1
- packages=$2
- groups=$3
+ shift
+ options=$@
- pl_mkfedora $root $packages $groups
+ pl_mkfedora $root $options
# Disable all services in reference image
chroot $root sh -c "/sbin/chkconfig --list | awk '{ print \$1 }' | xargs -i /sbin/chkconfig {} off"
mkdir -p ${root}/${datadir}
fi
done
-}
\ No newline at end of file
+}
+