From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 9 Sep 2014 13:01:19 +0000 (+0200)
Subject: grub: Don't use VGA for serial installations
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f6e04258a78b4b58cebbb434ece7ed26d8ce1bb;p=people%2Fms%2Fipfire-2.x.git

grub: Don't use VGA for serial installations

On systems without a graphics card, grub did not count down
the timeout.
---

diff --git a/lfs/flash-images b/lfs/flash-images
index 79701aad96..aeaace26e4 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -167,7 +167,7 @@ endif
 ifeq "$(BOOTLOADER)" "grub"
 ifeq "$(SCON)" "1"
 	# Enable serial console on GRUB
-	echo "GRUB_TERMINAL=\"serial console\"" >> $(MNThdd)/etc/default/grub
+	echo "GRUB_TERMINAL=\"serial\"" >> $(MNThdd)/etc/default/grub
 	echo "GRUB_SERIAL_COMMAND=\"serial --unit=0 --speed=115200\"" >> $(MNThdd)/etc/default/grub
 
 	sed -i -e "s|panic=10|& console=ttyS0,115200n8|g" $(MNThdd)/etc/default/grub
diff --git a/src/installer/main.c b/src/installer/main.c
index 1f7ec2b4ba..e5da6ec9ba 100644
--- a/src/installer/main.c
+++ b/src/installer/main.c
@@ -621,7 +621,7 @@ int main(int argc, char *argv[]) {
 			goto EXIT;
 		}
 
-		fprintf(f, "GRUB_TERMINAL=\"serial console\"\n");
+		fprintf(f, "GRUB_TERMINAL=\"serial\"\n");
 		fprintf(f, "GRUB_SERIAL_COMMAND=\"serial --unit=0 --speed=%d\"\n", SERIAL_BAUDRATE);
 		fclose(f);