diff options
| author | jkim <jkim@FreeBSD.org> | 2006-03-14 19:02:00 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2006-03-14 19:02:00 +0000 |
| commit | d36ace4c2575daf2f4ecdff71cfe1dc0f1edd458 (patch) | |
| tree | 57c211ec6096368bb843e18305a58e70b6c2d1fe /sys/boot | |
| parent | c7404250a58cabb69293f802335bb65720c38623 (diff) | |
| download | FreeBSD-src-d36ace4c2575daf2f4ecdff71cfe1dc0f1edd458.zip FreeBSD-src-d36ace4c2575daf2f4ecdff71cfe1dc0f1edd458.tar.gz | |
Export SMBIOS serial numbers by default. To turn it off, use
'BOOT_HIDE_SERIAL_NUMBERS' knob.
Suggested by: ceri
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/i386/libi386/Makefile | 6 | ||||
| -rw-r--r-- | sys/boot/i386/libi386/smbios.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile index 1bf4c24..01ae3f4 100644 --- a/sys/boot/i386/libi386/Makefile +++ b/sys/boot/i386/libi386/Makefile @@ -21,9 +21,9 @@ CFLAGS+= -DCOMSPEED=${BOOT_COMCONSOLE_SPEED} CFLAGS+= -DDISK_DEBUG .endif -.ifdef(BOOT_SENSITIVE_INFO) -# Show serial numbers, UUID, and asset tag from loader -CFLAGS+= -DSHOW_SENSITIVE_INFO +.if !defined(BOOT_HIDE_SERIAL_NUMBERS) +# Export serial numbers, UUID, and asset tag from loader. +CFLAGS+= -DSMBIOS_SERIAL_NUMBERS .endif # Include simple terminal emulation (cons25-compatible) diff --git a/sys/boot/i386/libi386/smbios.c b/sys/boot/i386/libi386/smbios.c index ecb0650..a2fb70d 100644 --- a/sys/boot/i386/libi386/smbios.c +++ b/sys/boot/i386/libi386/smbios.c @@ -64,7 +64,7 @@ static void smbios_setenv(const char *name, const uint8_t *dmi, static uint8_t smbios_checksum(const caddr_t addr, const uint8_t len); static uint8_t *smbios_sigsearch(const caddr_t addr, const uint32_t len); -#ifdef SHOW_SENSITIVE_INFO +#ifdef SMBIOS_SERIAL_NUMBERS static void smbios_setuuid(const char *name, const uint8_t *dmi, const int offset); #endif @@ -111,7 +111,7 @@ smbios_parse_table(const uint8_t *dmi) smbios_setenv("smbios.system.maker", dmi, 0x04); smbios_setenv("smbios.system.product", dmi, 0x05); smbios_setenv("smbios.system.version", dmi, 0x06); -#ifdef SHOW_SENSITIVE_INFO +#ifdef SMBIOS_SERIAL_NUMBERS smbios_setenv("smbios.system.serial", dmi, 0x07); smbios_setuuid("smbios.system.uuid", dmi, 0x08); #endif @@ -121,7 +121,7 @@ smbios_parse_table(const uint8_t *dmi) smbios_setenv("smbios.planar.maker", dmi, 0x04); smbios_setenv("smbios.planar.product", dmi, 0x05); smbios_setenv("smbios.planar.version", dmi, 0x06); -#ifdef SHOW_SENSITIVE_INFO +#ifdef SMBIOS_SERIAL_NUMBERS smbios_setenv("smbios.planar.serial", dmi, 0x07); #endif break; @@ -129,7 +129,7 @@ smbios_parse_table(const uint8_t *dmi) case 3: /* Type 3: System Enclosure or Chassis */ smbios_setenv("smbios.chassis.maker", dmi, 0x04); smbios_setenv("smbios.chassis.version", dmi, 0x06); -#ifdef SHOW_SENSITIVE_INFO +#ifdef SMBIOS_SERIAL_NUMBERS smbios_setenv("smbios.chassis.serial", dmi, 0x07); smbios_setenv("smbios.chassis.tag", dmi, 0x08); #endif @@ -222,7 +222,7 @@ smbios_sigsearch(const caddr_t addr, const uint32_t len) return(NULL); } -#ifdef SHOW_SENSITIVE_INFO +#ifdef SMBIOS_SERIAL_NUMBERS static void smbios_setuuid(const char *name, const uint8_t *dmi, const int offset) { |
