- install optional packages before optional groups, so that callers can

  force certain packages (such as coreutils) to be installed first
  before groupinstall is run, which seems to be broken and does not
  install dependencies in the right order

diff --git a/mkfedora b/mkfedora
index e05a543..5537364 100755 (executable)
--- a/mkfedora
+++ b/mkfedora
@@ -13,7 +13,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2004-2006 The Trustees of Princeton University
 #
-# $Id: mkfedora,v 1.10 2006/04/06 04:45:23 mlhuang Exp $
+# $Id: mkfedora,v 1.11 2006/04/10 20:37:18 mlhuang Exp $
 #
 
 export PATH=/sbin:/bin:/usr/sbin:/usr/bin
@@ -302,18 +302,18 @@ echo "* Installing glibc" >&3
 yum -c $vroot/etc/yum.conf --installroot=$vroot -y $excludes install glibc
 
 # Go, baby, go
-if [ ${#groups[*]} -gt 0 ] ; then
-    echo "* Installing optional groups" >&3
-    yum -c $vroot/etc/yum.conf --installroot=$vroot -y $excludes \
-       groupinstall "${groups[@]}"
-fi
-
 if [ ${#packages[*]} -gt 0 ] ; then
     echo "* Installing optional packages" >&3
     yum -c $vroot/etc/yum.conf --installroot=$vroot -y $excludes \
        install "${packages[@]}"
 fi
 
+if [ ${#groups[*]} -gt 0 ] ; then
+    echo "* Installing optional groups" >&3
+    yum -c $vroot/etc/yum.conf --installroot=$vroot -y $excludes \
+       groupinstall "${groups[@]}"
+fi
+
 # FC2 dev %preinstall checks /proc/mounts to make sure that /dev is
 # not currently mounted as devfs. If it thinks it is, it will refuse
 # to install the package. On a modern system running udev that mounts