Permalink
Browse files

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)
  • Loading branch information...
1 parent 185dc91 commit 23d9cd5eff5ee7d7588bd950e305cacab59ce40d @nwhitehorn nwhitehorn committed Sep 23, 2013
Showing with 4 additions and 2 deletions.
  1. +2 −1 usr.sbin/bsdinstall/partedit/gpart_ops.c
  2. +2 −1 usr.sbin/bsdinstall/partedit/partedit_powerpc.c
@@ -954,7 +954,8 @@ gpart_create(struct gprovider *pp, char *default_type, char *default_size,
}
/* 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",
@@ -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);

0 comments on commit 23d9cd5

Please sign in to comment.