diff options
| author | Lin Ling <Lin.Ling@Sun.COM> | 2008-12-02 12:12:41 -0800 |
|---|---|---|
| committer | Lin Ling <Lin.Ling@Sun.COM> | 2008-12-02 12:12:41 -0800 |
| commit | 38614cc7545c91d5a15f18afb63641c7ed357895 (patch) | |
| tree | 84840fdb067afe7372a2d4bd7c4176fbfc72b21a /usr/src/grub | |
| parent | 09011d400721fbca9dc5dfabd23419badcc06fc1 (diff) | |
| download | illumos-gate-38614cc7545c91d5a15f18afb63641c7ed357895.tar.gz | |
6770866 GRUB/ZFS should require physical path or devid, but not both (fix UFS boot)
Diffstat (limited to 'usr/src/grub')
| -rw-r--r-- | usr/src/grub/grub-0.97/stage2/builtins.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/usr/src/grub/grub-0.97/stage2/builtins.c b/usr/src/grub/grub-0.97/stage2/builtins.c index ac50700beb..d6f142dcce 100644 --- a/usr/src/grub/grub-0.97/stage2/builtins.c +++ b/usr/src/grub/grub-0.97/stage2/builtins.c @@ -2773,6 +2773,10 @@ expand_dollar_bootfs(char *in, char *out) int outlen, blen; int postcomma = 0; + /* no op if this is not zfs */ + if (is_zfs_mount == 0) + return (0); + if (current_bootpath[0] == '\0' && current_devid[0] == '\0') { errnum = ERR_NO_BOOTPATH; return (1); |