diff options
| author | sjg <sjg@FreeBSD.org> | 2013-10-13 02:35:19 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2013-10-13 02:35:19 +0000 |
| commit | 7fcd33c1faf567506b5c0b4148c7a15a10788a5d (patch) | |
| tree | 2c6f4d1ca5d1c643faea64e1f4c90105a1ab406a /usr.sbin/bsdinstall | |
| parent | 2a59274eda20cc626e28052fff7aa8b7bf6a3683 (diff) | |
| parent | 5cca672bb0892f1c5da630c34a1f98e2de4d7064 (diff) | |
| download | FreeBSD-src-7fcd33c1faf567506b5c0b4148c7a15a10788a5d.zip FreeBSD-src-7fcd33c1faf567506b5c0b4148c7a15a10788a5d.tar.gz | |
Merge head@256284
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 | ||||
| -rwxr-xr-x | usr.sbin/bsdinstall/scripts/mirrorselect | 2 |
3 files changed, 4 insertions, 4 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); diff --git a/usr.sbin/bsdinstall/scripts/mirrorselect b/usr.sbin/bsdinstall/scripts/mirrorselect index 0776a4d..ef17cfe 100755 --- a/usr.sbin/bsdinstall/scripts/mirrorselect +++ b/usr.sbin/bsdinstall/scripts/mirrorselect @@ -87,7 +87,6 @@ MIRROR=`dialog --backtitle "FreeBSD Installer" \ ftp://ftp8.de.freebsd.org "Germany #8"\ ftp://ftp.gr.freebsd.org "Greece"\ ftp://ftp2.gr.freebsd.org "Greece #2"\ - ftp://ftp.is.freebsd.org "Iceland"\ ftp://ftp3.ie.freebsd.org "Ireland #3"\ ftp://ftp.il.freebsd.org "Israel"\ ftp://ftp.it.freebsd.org "Italy"\ @@ -127,7 +126,6 @@ MIRROR=`dialog --backtitle "FreeBSD Installer" \ ftp://ftp2.se.freebsd.org "Sweden #2"\ ftp://ftp3.se.freebsd.org "Sweden #3"\ ftp://ftp4.se.freebsd.org "Sweden #4"\ - ftp://ftp5.se.freebsd.org "Sweden #5"\ ftp://ftp6.se.freebsd.org "Sweden #6"\ ftp://ftp.ch.freebsd.org "Switzerland"\ ftp://ftp.tw.freebsd.org "Taiwan"\ |
