D15862.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D15862.diff
View Options

	Index: head/stand/i386/gptboot/gptboot.c
	===================================================================
	--- head/stand/i386/gptboot/gptboot.c
	+++ head/stand/i386/gptboot/gptboot.c
	@@ -285,6 +285,16 @@
	bootinfo.bi_memsizes_valid++;
	bootinfo.bi_bios_dev = dsk.drive;

	+ /*
	+ * Initialize the serial console early with a modern default of 115200.
	+ * Later, we'll read PATH_DOTCONFIG and reconfigure serial according
	+ * to the configuration provided.
	+ */
	+ opts = OPT_SET(RBX_DUAL);
	+ ioctrl = (IO_SERIAL\|IO_KEYBOARD);
	+ if (sio_init(115200) != 0)
	+ ioctrl &= ~IO_SERIAL;
	+
	#ifdef LOADER_GELI_SUPPORT
	geli_init();
	#endif
	Index: head/stand/i386/zfsboot/zfsboot.c
	===================================================================
	--- head/stand/i386/zfsboot/zfsboot.c
	+++ head/stand/i386/zfsboot/zfsboot.c
	@@ -693,6 +693,16 @@
	}
	setheap(heap_next, heap_end);

	+ /*
	+ * Initialize the serial console early with a modern default of 115200.
	+ * Later, we'll read PATH_DOTCONFIG and reconfigure serial according
	+ * to the configuration provided.
	+ */
	+ opts = OPT_SET(RBX_DUAL);
	+ ioctrl = (IO_SERIAL\|IO_KEYBOARD);
	+ if (sio_init(115200) != 0)
	+ ioctrl &= ~IO_SERIAL;
	+
	dsk = malloc(sizeof(struct dsk));
	dsk->drive = (uint8_t )PTOV(ARGS);
	dsk->type = dsk->drive & DRV_HARD ? TYPE_AD : TYPE_FD;