diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2012-01-11 15:58:28 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2012-01-11 15:58:28 +0000 |
| commit | 6197367c137a215724dd315746c755ba177ff4a4 (patch) | |
| tree | 868e766ddb397dead0edabb136ecb56b6ee6494c /sys/arch/amd64/stand | |
| parent | 1ac26851e24ca3e562863b7739118f287b80b8d1 (diff) | |
Pass the DUID of the boot disk via bootduid instead of rootduid, since it
is the DUID that we booted from, which is not always going to be the same
as the DUID that we mount root on.
Diffstat (limited to 'sys/arch/amd64/stand')
| -rw-r--r-- | sys/arch/amd64/stand/libsa/exec_i386.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/amd64/stand/libsa/exec_i386.c b/sys/arch/amd64/stand/libsa/exec_i386.c index e5c09d4c59c..fce78a12636 100644 --- a/sys/arch/amd64/stand/libsa/exec_i386.c +++ b/sys/arch/amd64/stand/libsa/exec_i386.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_i386.c,v 1.7 2011/04/26 17:33:17 jsing Exp $ */ +/* $OpenBSD: exec_i386.c,v 1.8 2012/01/11 15:58:27 jsing Exp $ */ /* * Copyright (c) 1997-1998 Michael Shalayeff @@ -56,7 +56,7 @@ run_loadfile(u_long *marks, int howto) extern int com_speed; /* from bioscons.c */ bios_ddb_t ddb; extern int db_console; - bios_rootduid_t rootduid; + bios_bootduid_t bootduid; if (sa_cleanup != NULL) (*sa_cleanup)(); @@ -73,8 +73,8 @@ run_loadfile(u_long *marks, int howto) addbootarg(BOOTARG_DDB, sizeof(ddb), &ddb); } - bcopy(bootdev_dip->disklabel.d_uid, &rootduid.duid, sizeof(rootduid)); - addbootarg(BOOTARG_ROOTDUID, sizeof(rootduid), &rootduid); + bcopy(bootdev_dip->disklabel.d_uid, &bootduid.duid, sizeof(bootduid)); + addbootarg(BOOTARG_BOOTDUID, sizeof(bootduid), &bootduid); /* Pass memory map to the kernel */ mem_pass(); |