]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
grub: Don't use VGA for serial installations
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 9 Sep 2014 13:01:19 +0000 (15:01 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 9 Sep 2014 13:01:19 +0000 (15:01 +0200)
On systems without a graphics card, grub did not count down
the timeout.

lfs/flash-images
src/installer/main.c

index 79701aad96713a2130e02fae9dd916840c35c2bf..aeaace26e4bae40dff9129b3e53dc5501f31f53b 100644 (file)
@@ -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
index 1f7ec2b4ba8f6d3cc5a85fd2ad264d3a6c816f18..e5da6ec9baf205a3d94ea6defabe8688cd3bc19d 100644 (file)
@@ -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);