D50334.diff
No OneTemporary
Actions

Size

839 B

Referenced Files

None

Subscribers

None

D50334.diff
View Options

	diff --git a/stand/common/metadata.c b/stand/common/metadata.c
	--- a/stand/common/metadata.c
	+++ b/stand/common/metadata.c
	@@ -111,7 +111,7 @@
	* tested/set by MI code before launching the kernel.
	*/
	rootdevname = getenv("rootdev");
	- if (rootdevname == NULL)
	+ if (rootdevname == NULL \|\| *rootdevname == '\0')
	rootdevname = getenv("currdev");
	/* Try reading the /etc/fstab file to select the root device */
	getrootmount(rootdevname);
	diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c
	--- a/stand/efi/loader/main.c
	+++ b/stand/efi/loader/main.c
	@@ -513,7 +513,7 @@
	* it's wrong.
	*/
	rootdev = getenv("rootdev");
	- if (rootdev != NULL) {
	+ if (rootdev != NULL && *rootdev != '\0') {
	printf(" Setting currdev to configured rootdev %s\n",
	rootdev);
	set_currdev(rootdev);