From ea69a3d547a2c1794896e0a8bcbcfaa4728ced6e Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Fri, 31 Aug 2007 02:20:54 +0000 Subject: [PATCH] fix pl_mkfedora: call mkfedora not ./mkfedora fix pl_setup_chroot: proper options argument handling --- build.common | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/build.common b/build.common index 498ac1ee..900dad62 100644 --- a/build.common +++ b/build.common @@ -6,7 +6,7 @@ # Marc E. Fiuczynski # Copyright (C) 2007 The Trustees of Princeton University # -# $Id:$ +# $Id: build.common,v 1.1.2.3 2007/08/30 17:43:08 mef Exp $ # function pl_getDefaultFedoraRelease() { @@ -116,15 +116,15 @@ function pl_mkfedora() { [ -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" @@ -203,4 +203,5 @@ function pl_fixdirs() { mkdir -p ${root}/${datadir} fi done -} \ No newline at end of file +} + -- 2.45.2