--- mkkickstart-1.0/mkkickstart.old	Thu Sep 10 00:43:16 1998
+++ mkkickstart-1.0/mkkickstart	Thu Sep 10 00:48:04 1998
@@ -2,7 +2,7 @@
 
 #
 #	Generate a kickstart file from a live Red Hat 5.0+ machine
-#		Alan Cox (c) Copyright 1998
+#		Alan Cox (c) Copyright 1998 Red Hat Software
 #
 #	This software is provided under the GNU Public License v2 or later
 #
@@ -113,7 +113,9 @@
 fi
 echo -n "keyboard "
 sed < /etc/sysconfig/keyboard -e "s/^.*\///"| sed -e "s/\.map\"$//"
-echo "zerombr"
+case `arch` in
+	i?86 ) echo "zerombr";;
+esac
 fdisk -l 2>/dev/null | grep "^/dev/[shx]da" | sort >.tmp1$$ 
 sort /etc/fstab >.tmp3$$
 join -j 1 .tmp3$$ .tmp1$$ >.tmp2$$
@@ -146,10 +148,12 @@
 	echo -n "--utc "
 fi
 file /etc/localtime | sed -e "s/^.*zoneinfo\///"
-if [ -f /etc/X11/XF86Config ]; then
-	MONITOR=`cat /etc/X11/XF86Config |grep Identifier| head -1 | sed -e 's/\"$//'| sed -e 's/^[ \t]*Identifier[ \t]*\"//'| tr [A-Z] [a-z] `
-	SERVER=`file /etc/X11/X| sed -e "s/^.*\/XF86_//"`
-	echo 'xconfig --server "'$SERVER'" --monitor "'$MONITOR'"'
+if [ ! "x"$NOX = "xy" ]; then
+	if [ -f /etc/X11/XF86Config ]; then
+		MONITOR=`cat /etc/X11/XF86Config |grep Identifier| head -1 | sed -e 's/\"$//'| sed -e 's/^[ \t]*Identifier[ \t]*\"//'| tr [A-Z] [a-z] `
+		SERVER=`file /etc/X11/X| sed -e "s/^.*\/XF86_//"`
+		echo 'xconfig --server "'$SERVER'" --monitor "'$MONITOR'"'
+	fi
 fi
 echo -n "rootpw --iscrypted "
 grep "^root:" /etc/passwd | sed -e "s/^root://" | sed -e "s/:.*$//"
