diff options
| author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2013-09-23 14:18:34 +0000 |
|---|---|---|
| committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2013-09-23 14:18:34 +0000 |
| commit | 23d9cd5eff5ee7d7588bd950e305cacab59ce40d (patch) | |
| tree | b356fbb171c0392f3be0681a118ee7002978451d /usr.sbin/bsdinstall | |
| parent | 185dc91bf29b66981dcb68f679ed3f2d50c7a69e (diff) | |
| download | FreeBSD-src-23d9cd5eff5ee7d7588bd950e305cacab59ce40d.zip FreeBSD-src-23d9cd5eff5ee7d7588bd950e305cacab59ce40d.tar.gz | |
Add installer support for CHRP/PAPR PowerPC systems that use MBR+BSD
formatting, like x86, but with an additional MBR slice containing a raw
boot partition.
Approved by: re (gjb)
Diffstat (limited to 'usr.sbin/bsdinstall')
| -rw-r--r-- | usr.sbin/bsdinstall/partedit/gpart_ops.c | 3 | ||||
| -rw-r--r-- | usr.sbin/bsdinstall/partedit/partedit_powerpc.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/bsdinstall/partedit/gpart_ops.c b/usr.sbin/bsdinstall/partedit/gpart_ops.c index 479365a..289ac98 100644 --- a/usr.sbin/bsdinstall/partedit/gpart_ops.c +++ b/usr.sbin/bsdinstall/partedit/gpart_ops.c @@ -954,7 +954,8 @@ addpartform: } /* If there isn't one, and we need one, ask */ - if (strcmp(items[2].text, "/") == 0 && bootpart_size(scheme) > 0 && + if ((strcmp(items[0].text, "freebsd") == 0 || + strcmp(items[2].text, "/") == 0) && bootpart_size(scheme) > 0 && pp == NULL) { if (interactive) choice = dialog_yesno("Boot Partition", diff --git a/usr.sbin/bsdinstall/partedit/partedit_powerpc.c b/usr.sbin/bsdinstall/partedit/partedit_powerpc.c index ef23eb6..06129c7 100644 --- a/usr.sbin/bsdinstall/partedit/partedit_powerpc.c +++ b/usr.sbin/bsdinstall/partedit/partedit_powerpc.c @@ -59,7 +59,8 @@ is_scheme_bootable(const char *part_type) { return (1); if (strcmp(platform, "ps3") == 0 && strcmp(part_type, "GPT") == 0) return (1); - if (strcmp(platform, "chrp") == 0 && strcmp(part_type, "MBR") == 0) + if (strcmp(platform, "chrp") == 0 && + (strcmp(part_type, "MBR") == 0 || strcmp(part_type, "BSD") == 0)) return (1); return (0); |
