diff options
| author | Alexander Eremin <a.eremin@nexenta.com> | 2014-12-02 09:05:47 +0100 |
|---|---|---|
| committer | Dan McDonald <danmcd@omniti.com> | 2014-12-04 10:18:21 -0500 |
| commit | 08db0dbccad017e19ad23f4b307e9fd0dc96cda1 (patch) | |
| tree | 11cfb2bd2f3d733ece216bc9fba5605a64e091cd /usr/src | |
| parent | c1379625401dfbe1c39b79136dd384a571d47fde (diff) | |
| download | illumos-joyent-08db0dbccad017e19ad23f4b307e9fd0dc96cda1.tar.gz | |
5377 bootadm update-archive misidentifies BEs as ramdisks
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Dan McDonald <danmcd@omniti.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/boot/bootadm/bootadm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr/src/cmd/boot/bootadm/bootadm.c b/usr/src/cmd/boot/bootadm/bootadm.c index 964f9b7751..c9466725f5 100644 --- a/usr/src/cmd/boot/bootadm/bootadm.c +++ b/usr/src/cmd/boot/bootadm/bootadm.c @@ -24,7 +24,7 @@ */ /* - * Copyright 2011 Nexenta Systems, Inc. All rights reserved. + * Copyright 2014 Nexenta Systems, Inc. All rights reserved. */ /* @@ -121,7 +121,7 @@ typedef struct { #define GRUB_MENU "/boot/grub/menu.lst" #define MENU_TMP "/boot/grub/menu.lst.tmp" #define GRUB_BACKUP_MENU "/etc/lu/GRUB_backup_menu" -#define RAMDISK_SPECIAL "/ramdisk" +#define RAMDISK_SPECIAL "/dev/ramdisk/" #define STUBBOOT "/stubboot" #define MULTIBOOT "/platform/i86pc/multiboot" #define GRUBSIGN_DIR "/boot/grub/bootsign" @@ -3466,7 +3466,8 @@ is_ramdisk(char *root) return (0); } - if (strstr(mnt.mnt_special, RAMDISK_SPECIAL) != NULL) { + if (strncmp(mnt.mnt_special, RAMDISK_SPECIAL, + strlen(RAMDISK_SPECIAL)) == 0) { if (bam_verbose) bam_error(IS_RAMDISK, bam_root); (void) fclose(fp); |