Date: Mon, 23 Sep 2013 14:18:35 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255817 - head/usr.sbin/bsdinstall/partedit Message-ID: <201309231418.r8NEIZjP044490@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nwhitehorn Date: Mon Sep 23 14:18:34 2013 New Revision: 255817 URL: http://svnweb.freebsd.org/changeset/base/255817 Log: 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) Modified: head/usr.sbin/bsdinstall/partedit/gpart_ops.c head/usr.sbin/bsdinstall/partedit/partedit_powerpc.c Modified: head/usr.sbin/bsdinstall/partedit/gpart_ops.c ============================================================================== --- head/usr.sbin/bsdinstall/partedit/gpart_ops.c Mon Sep 23 14:00:18 2013 (r255816) +++ head/usr.sbin/bsdinstall/partedit/gpart_ops.c Mon Sep 23 14:18:34 2013 (r255817) @@ -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", Modified: head/usr.sbin/bsdinstall/partedit/partedit_powerpc.c ============================================================================== --- head/usr.sbin/bsdinstall/partedit/partedit_powerpc.c Mon Sep 23 14:00:18 2013 (r255816) +++ head/usr.sbin/bsdinstall/partedit/partedit_powerpc.c Mon Sep 23 14:18:34 2013 (r255817) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309231418.r8NEIZjP044490>