X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?p=xodist;a=blobdiff_plain;f=mkext3.sh;h=08a1c41c165e2493a492c646a4f98db18ef5a67f;hp=8d8532477cf0b5a09ec512b9f9e3f45bcafb398a;hb=4147cb5472e422ccff6c96040c303c4cc6e8a120;hpb=c21aa494c7c8a12cc93c2f4314033be8ce7e03f5

diff --git a/mkext3.sh b/mkext3.sh
index 8d85324..08a1c41 100755
--- a/mkext3.sh
+++ b/mkext3.sh
@@ -18,6 +18,7 @@
 
 IMG_NAME=""
 ROOT_DIR=""
+SKIP_GRUB="n"
 
 . ./functions.sh
 
@@ -128,7 +129,7 @@ EOF
 
 	# grub-install is pretty broken, so we do this manually
 	geom=`parted -s "$img" "unit chs" "print" | sed -ne 's/geometry: \([0-9]\+\),\([0-9]\+\),\([0-9]\+\)/:\1 \2 \3:/p' | cut -d: -f2`
-	grub --device-map=/dev/null <<EOF
+	grub --batch --device-map=/dev/null <<EOF
 device (hd0) $img
 geometry (hd0) $geom
 root (hd0,0)
@@ -201,7 +202,9 @@ mk_ext3_fs()
 	
 	# populate the filesystem
 	cp -ra "$root_dir"/* "$mount_point_root" || true
-	grub_install "$img" "$mount_point_root"
+	if [ "$SKIP_GRUB" != "y" ]; then
+		grub_install "$img" "$mount_point_root"
+	fi
 
 	# umount the filesystem
 	sed -ne 's/^LABEL=//p' configs/${CONFIG_TYPE}/fstab-ext3 | \
@@ -232,6 +235,7 @@ usage()
 	echo "Options:" 1>&2
 	echo "  --config-type <config>    directory name in configs/ to use" 1>&2
 	echo "  --help                    display this help screen" 1>&2
+	echo "  --skip-grub               don't install GRUB on image" 1>&2
 	echo "" 1>&2
 	exit 1
 }
@@ -247,6 +251,9 @@ do
 		}
 		shift
 		;;
+	--skip-grub)
+		SKIP_GRUB="y"
+		;;
 	--help|-h)
 		usage
 		;;
@@ -277,7 +284,10 @@ if [ ! -d "$ROOT_DIR" ]; then
 	usage
 fi
 
-check_for_cmds losetup parted mke2fs tune2fs grub || exit 1
+check_for_cmds losetup parted mke2fs tune2fs || exit 1
+if [ "$SKIP_GRUB" != "y" ]; then
+	check_for_cmds grub || exit 1
+fi
 
 # create image's /etc/fstab
 if [ ! -f ./configs/${CONFIG_TYPE}/fstab-ext3 ]; then
@@ -298,3 +308,5 @@ mk_ext3_fs ${IMG_NAME} ${ROOT_DIR}
 #mount ${IMG_NAME}.ext3 $MOUNT_POINT -o loop,offset=$OS_PART1_BEGIN -t ext3
 #cp -r "$ROOT_DIR"/* $MOUNT_POINT
 #umount $MOUNT_POINT
+
+exit 0