2006-08-08 Jeremy Katz <katzj@redhat.com>

	Patch from Paul Schroder <pschroeder@uplogix.com> for nogr mode
	* scripts/buildinstall: Add --nogr option
	* scripts/mk-images: Use --nogr
	* scripts/mk-images.x86: Only put splash image in if building a
	graphics stage2
	* scripts/upd-instroot: Cleanups for --nogr

4 files changed, 47 insertions, 26 deletions

diff --git a/scripts/buildinstall b/scripts/buildinstall
index e111f8791..e054bd762 100755
--- a/scripts/buildinstall
+++ b/scripts/buildinstall
@@ -34,6 +34,10 @@ while [ $# -gt 0 ]; do
 	    PRODUCTPATH=$2
 	    shift; shift
 	    ;;
+	--nogr)
+	    NOGRSTR="--nogr"
+	    shift
+	    ;;
 	--debug)
 	    DEBUGSTR="--debug"
 	    shift
@@ -127,7 +131,7 @@ MK_STAMP=$BUILDINSTDIR/makestamp.py
 BUILDINSTALL=$BUILDINSTDIR/buildinstall
 
 echo "Building images..."
-$UPD_INSTROOT $DEBUGSTR $PKGDIR $TREEDIR/image-template $TREEDIR/instimage
+$UPD_INSTROOT $DEBUGSTR $NOGRSTR $PKGDIR $TREEDIR/image-template $TREEDIR/instimage
 
 echo "Creating repository metadata..."
 createrepo -g $PRODUCTPATH/base/comps.xml -q $p
@@ -139,7 +143,7 @@ if [ -n "$PKGORDER" ]; then
 fi
 
 echo "Making images..."
-$MK_IMAGES $DEBUGSTR $PKGDIR $p $TREEDIR/image-template $TREEDIR/instimage $BUILDARCH "$PRODUCTSTR" $VERSION $PRODUCTPATH "$BUGURL"
+$MK_IMAGES $DEBUGSTR $NOGRSTR $PKGDIR $p $TREEDIR/image-template $TREEDIR/instimage $BUILDARCH "$PRODUCTSTR" $VERSION $PRODUCTPATH "$BUGURL"
 
 echo "Writing .discinfo file"
 $MK_STAMP --releasestr="$RELEASESTR" --arch=$BUILDARCH --discNum="$DISCSTR" --baseDir=$PRODUCTPATH/base --packagesDir=$PKGDIR --pixmapsDir=$PRODUCTPATH/pixmaps --outfile=$p/.discinfo
diff --git a/scripts/mk-images b/scripts/mk-images
index 3d01d494e..4d07d35e1 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -15,6 +15,12 @@ if [ "$1" == "--debug" ]; then
     shift
 fi
 
+NEEDGR=yes
+if [ "$1" == "--nogr" ]; then
+    NEEDGR=""
+    shift
+fi
+
 if [ -z "$1" -o -z "$2" -o -z "$3" -o -z "$4" -o -z "$5" -o -z "$6" -o -z "$7" -o -z "$8" ]; then usage; fi
 
 PRODUCT=$6
diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86
index 822e56961..8063db36e 100644
--- a/scripts/mk-images.x86
+++ b/scripts/mk-images.x86
@@ -12,17 +12,21 @@ fi
 # prepare a directory with the kernel, initrd, and various message files
 # used to populate a boot image
 prepareBootTree() {
-	(cd $BOOTDISKDIR; find . ! -name "*.msg" -maxdepth 1 ! -type d | cpio --quiet -p $MBD_BOOTTREE)
+	(cd $BOOTDISKDIR; find . -maxdepth 1 ! -name "*.msg" ! -type d | cpio --quiet -p $MBD_BOOTTREE)
 	
 	cp $MBD_FSIMAGE $MBD_BOOTTREE/initrd.img
 	cp $KERNELROOT/boot/vmlinuz-* $MBD_BOOTTREE/vmlinuz
-	$IMGPATH/usr/lib/anaconda-runtime/splashtolss.sh $BOOTDISKDIR/syslinux-splash.png $BOOTDISKDIR/splash.lss
-	if [ $? != 0 ]; then
-	   echo $0: Failed to create splash.lss
-	   exit 1
-	fi	
-	cp $BOOTDISKDIR/splash.lss $MBD_BOOTTREE/splash.lss
-	rm -f $MBD_BOOTTREE/syslinux-splash.png
+
+	if [ -n "$NEEDGR" ]; then
+	  $IMGPATH/usr/lib/anaconda-runtime/splashtolss.sh $BOOTDISKDIR/syslinux-splash.png $BOOTDISKDIR/splash.lss
+	  if [ $? != 0 ]; then
+	     echo $0: Failed to create splash.lss
+	     exit 1
+	  fi	
+	  cp $BOOTDISKDIR/splash.lss $MBD_BOOTTREE/splash.lss
+	  rm -f $MBD_BOOTTREE/syslinux-splash.png
+	fi
+
 	rm -f $MBD_BOOTTREE/memtest*
 	for file in $BOOTDISKDIR/*.msg; do
 	    filename=`basename $file`
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index a15cc7ae1..09535eb51 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -2,12 +2,18 @@
 
 ORIGDIR=`pwd`
 DEBUG=""
+NEEDGR=yes
 
 if [ "$1" == "--debug" ]; then
     DEBUG="--debug"
     shift
 fi
 
+if [ "$1" == "--nogr" ]; then
+    NEEDGR=""
+    shift
+fi
+
 if [ -z "$1" ]; then
 	echo "upd-instroot: updates instimage from a Red Hat RPMS directory"
 	echo "usage:        $0 <packagedir> [templatedir] [instroot]"
@@ -33,7 +39,6 @@ else
     LIBDIR=lib
 fi
 
-NEEDGR=yes
 
 prunePackageList() {
 	PACKAGEPATH=$1
@@ -62,12 +67,12 @@ expandPackageSet() {
 
     [ -d $PKGDEST ] || die "ERROR: directory missing: $PKGDEST"
     for n in $RPMS; do 
-	[ -n "$DEBUG" ] && echo -ne "\rExpanding packages..." $(basename $n)
+	[ -n "$DEBUG" ] && echo -e "\rExpanding packages..." $(basename $n)
 	if [ "$(rpm --nosignature --nodigest -qp --qf '%{NAME}' $n)" = "tzdata" ] ; then
 	    TZDATA=$n
 	fi 
 	rpm2cpio $n | (cd $PKGDEST; cpio -E $KEEPFILES --quiet -iumd)
-	[ -n "$DEBUG" ] && echo -ne "\rExpanding packages..." "$(basename $n | sed 's/./ /g')"
+	[ -n "$DEBUG" ] && echo -e "\rExpanding packages..." "$(basename $n | sed 's/./ /g')"
     done
     pushd $PKGDEST/$LIBDIR >/dev/null 2>&1
     if [ -d obsolete/linuxthreads/ ]; then
@@ -1020,13 +1025,15 @@ for p in $DEST $DESTGR; do
 done
 
 # fixup joe links
-ln -fs jpicorc $DESTGR/etc/joe/picorc
-ln -fs jpicorc $DESTGR/etc/joe/jnanorc
-ln -fs jpicorc $DESTGR/etc/joe/nanorc
-ln -fs jmacsrc $DESTGR/etc/joe/emacsrc
-ln -fs jmacs $DESTGR/usr/bin/emacs
-ln -fs jpico $DESTGR/usr/bin/pico
-ln -fs jpico $DESTGR/usr/bin/nano
+if [ -n "$NEEDGR" ]; then
+    ln -fs jpicorc $DESTGR/etc/joe/picorc
+    ln -fs jpicorc $DESTGR/etc/joe/jnanorc
+    ln -fs jpicorc $DESTGR/etc/joe/nanorc
+    ln -fs jmacsrc $DESTGR/etc/joe/emacsrc
+    ln -fs jmacs $DESTGR/usr/bin/emacs
+    ln -fs jpico $DESTGR/usr/bin/pico
+    ln -fs jpico $DESTGR/usr/bin/nano
+fi
 
 # create selinux config
 if [ -e $DEST/etc/selinux/targeted ]; then
@@ -1080,15 +1087,15 @@ cp $DEST/etc/nsswitch.conf $DESTGR/etc/nsswitch.conf
 cp $DEST/etc/libuser.conf $DESTGR/etc/libuser.conf
 
 # fixup man.config to point into /mnt/sysimage for rescue
-echo "Fixing up /etc/man.config to point into /mnt/sysimage"
 if [ -n "$NEEDGR" ]; then
+    echo "Fixing up /etc/man.config to point into /mnt/sysimage"
     mv $DESTGR/etc/man.config $DESTGR/etc/man.config-old
     cat $DESTGR/etc/man.config-old | sed 's^/usr/bin^/mnt/sysimage/usr/bin^' | sed 's^/bin/cat^/mnt/sysimage/usr/bin/cat^'  > $DESTGR/etc/man.config
     rm -f $DESTGR/etc/man.config-old
 fi
 
-echo "Running mkfontdir..."
 if [ -n "$NEEDGR" ]; then
+    echo "Running mkfontdir..."
     mkfontdir $DESTGR/usr/share/X11/fonts/*
 fi
 
@@ -1100,8 +1107,8 @@ rm -rf $DEST/etc/selinux
 mkdir $DEST/etc/selinux
 cp -r $DESTGR/etc/selinux/* $DEST/etc/selinux/
 
-echo "Getting pango modules"
 if [ -n "$NEEDGR" ]; then
+    echo "Getting pango modules"
     # sick sick sick hack for pango-querymodules being -32 or -64
     mv $DESTGR/usr/bin/pango-querymodules* $DESTGR/usr/bin/pango-querymodules
     /usr/sbin/chroot $DESTGR /usr/bin/pango-querymodules > $DESTGR/etc/pango/pango.modules
@@ -1128,15 +1135,15 @@ HOSTTRIPLET=`echo $canonhost | sed "s/^ppc/powerpc/"`
 
 mkdir -p $DESTGR/etc/gtk-2.0/$HOSTTRIPLET
 
-echo "Getting gtk2 input method modules"
 if [ -n "$NEEDGR" ]; then
+    echo "Getting gtk2 input method modules"
     mv $DESTGR/usr/bin/gtk-query-immodules-2.0* $DESTGR/usr/bin/gtk-query-immodules-2.0
     /usr/sbin/chroot $DESTGR /usr/bin/gtk-query-immodules-2.0 > $DESTGR/etc/gtk-2.0/$HOSTTRIPLET/gtk.immodules
     rm -f $DESTGR/usr/bin/gtk-query-immodules-2.0
 fi
 
-echo "Getting gtk2 gdk-pixbuf loaders"
 if [ -n "$NEEDGR" ]; then
+    echo "Getting gtk2 gdk-pixbuf loaders"
     mv $DESTGR/usr/bin/gdk-pixbuf-query-loaders* $DESTGR/usr/bin/gdk-pixbuf-query-loaders
     /usr/sbin/chroot $DESTGR /usr/bin/gdk-pixbuf-query-loaders > $DESTGR/etc/gtk-2.0/$HOSTTRIPLET/gdk-pixbuf.loaders
     rm -f $DESTGR/usr/bin/gdk-pixbuf-query-loaders
@@ -1242,8 +1249,8 @@ if [ -d $DEST/usr/share/locale ]; then
     done
 fi
 
-echo "Creating fontconfig cache"
 if [ -n "$NEEDGR" ]; then
+    echo "Creating fontconfig cache"
     /usr/sbin/chroot $DESTGR /usr/bin/fc-cache
     rm -f $DESTGR/usr/bin/fc-cache
 fi