Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-9]: src/usr.sbin/sysinst Pull up following revision(s) (requested...
details: https://anonhg.NetBSD.org/src/rev/923279426a84
branches: netbsd-9
changeset: 1001437:923279426a84
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Tue Jan 28 10:17:57 2020 +0000
description:
Pull up following revision(s) (requested by martin in ticket #668):
usr.sbin/sysinst/arch/cobalt/md.c: revision 1.11
usr.sbin/sysinst/arch/cobalt/md.c: revision 1.12
usr.sbin/sysinst/arch/arc/md.c: revision 1.11
usr.sbin/sysinst/arch/arc/md.c: revision 1.12
usr.sbin/sysinst/partman.c: revision 1.43
usr.sbin/sysinst/partman.c: revision 1.46
usr.sbin/sysinst/partman.c: revision 1.47
usr.sbin/sysinst/partman.c: revision 1.48
usr.sbin/sysinst/partman.c: revision 1.49
usr.sbin/sysinst/msg.pm.fr: revision 1.2
usr.sbin/sysinst/upgrade.c: revision 1.14
usr.sbin/sysinst/arch/i386/md.c: revision 1.28
usr.sbin/sysinst/arch/i386/md.c: revision 1.29
usr.sbin/sysinst/arch/ofppc/md.c: revision 1.9
usr.sbin/sysinst/arch/sandpoint/md.c: revision 1.7
usr.sbin/sysinst/arch/sandpoint/md.c: revision 1.8
usr.sbin/sysinst/gpt.c: revision 1.14
usr.sbin/sysinst/gpt.c: revision 1.15
usr.sbin/sysinst/arch/luna68k/md.c: revision 1.8
usr.sbin/sysinst/gpt.c: revision 1.16
usr.sbin/sysinst/msg.pm.de: revision 1.2
usr.sbin/sysinst/arch/evbarm/md.c: revision 1.11
usr.sbin/sysinst/arch/evbarm/md.c: revision 1.12
usr.sbin/sysinst/arch/evbarm/md.c: revision 1.13
usr.sbin/sysinst/arch/evbarm/md.c: revision 1.14
usr.sbin/sysinst/sizemultname.c: revision 1.4
usr.sbin/sysinst/msg.pm.en: revision 1.2
usr.sbin/sysinst/arch/landisk/md.c: revision 1.12
usr.sbin/sysinst/util.c: revision 1.41
usr.sbin/sysinst/arch/landisk/md.c: revision 1.13
usr.sbin/sysinst/util.c: revision 1.42
usr.sbin/sysinst/arch/ofppc/md.c: revision 1.10
usr.sbin/sysinst/partitions.c: revision 1.9
usr.sbin/sysinst/arch/evbarm/md.h: revision 1.4
usr.sbin/sysinst/arch/evbarm/md.h: revision 1.5
usr.sbin/sysinst/arch/evbmips/md.c: revision 1.7
usr.sbin/sysinst/arch/evbmips/md.c: revision 1.8
usr.sbin/sysinst/msg.mi.fr: revision 1.25
usr.sbin/sysinst/msg.mi.de: revision 1.20
usr.sbin/sysinst/install.c: revision 1.14
usr.sbin/sysinst/partitions.h: revision 1.13
usr.sbin/sysinst/partitions.h: revision 1.14
usr.sbin/sysinst/arch/evbppc/md.c: revision 1.7
usr.sbin/sysinst/arch/playstation2/md.c: revision 1.7
usr.sbin/sysinst/msg.mi.en: revision 1.27
usr.sbin/sysinst/partitions.h: revision 1.15
usr.sbin/sysinst/arch/evbppc/md.c: revision 1.8
usr.sbin/sysinst/arch/hpcarm/md.c: revision 1.7
usr.sbin/sysinst/arch/playstation2/md.c: revision 1.8
usr.sbin/sysinst/msg.pm.pl: revision 1.2
usr.sbin/sysinst/arch/hpcarm/md.c: revision 1.8
usr.sbin/sysinst/msg.mi.es: revision 1.21
usr.sbin/sysinst/arch/zaurus/md.c: revision 1.7
usr.sbin/sysinst/target.c: revision 1.11
usr.sbin/sysinst/arch/zaurus/md.c: revision 1.8
usr.sbin/sysinst/part_edit.c: revision 1.14
usr.sbin/sysinst/part_edit.c: revision 1.15
usr.sbin/sysinst/part_edit.c: revision 1.16
usr.sbin/sysinst/defs.h: revision 1.50
usr.sbin/sysinst/defs.h: revision 1.51
usr.sbin/sysinst/defs.h: revision 1.52
usr.sbin/sysinst/defs.h: revision 1.53
usr.sbin/sysinst/defs.h: revision 1.54
usr.sbin/sysinst/arch/hpcmips/md.c: revision 1.7
usr.sbin/sysinst/arch/hpcmips/md.c: revision 1.8
usr.sbin/sysinst/arch/hpcsh/md.c: revision 1.8
usr.sbin/sysinst/msg.pm.es: revision 1.2
usr.sbin/sysinst/arch/hpcsh/md.c: revision 1.9
usr.sbin/sysinst/label.c: revision 1.18
usr.sbin/sysinst/label.c: revision 1.19
usr.sbin/sysinst/net.c: revision 1.35
usr.sbin/sysinst/msg.mi.pl: revision 1.28
usr.sbin/sysinst/disklabel.c: revision 1.28
usr.sbin/sysinst/disklabel.c: revision 1.29
usr.sbin/sysinst/mbr.c: revision 1.24
usr.sbin/sysinst/disks.c: revision 1.59
usr.sbin/sysinst/mbr.c: revision 1.25
usr.sbin/sysinst/mbr.c: revision 1.26
usr.sbin/sysinst/mbr.c: revision 1.27
usr.sbin/sysinst/mbr.c: revision 1.28
usr.sbin/sysinst/label.c: revision 1.20
usr.sbin/sysinst/mbr.c: revision 1.29
usr.sbin/sysinst/bsddisklabel.c: revision 1.34
usr.sbin/sysinst/bsddisklabel.c: revision 1.35
usr.sbin/sysinst/bsddisklabel.c: revision 1.36
usr.sbin/sysinst/bsddisklabel.c: revision 1.37
usr.sbin/sysinst/disklabel.c: revision 1.30
usr.sbin/sysinst/bsddisklabel.c: revision 1.38
usr.sbin/sysinst/disklabel.c: revision 1.31
usr.sbin/sysinst/disklabel.c: revision 1.32
usr.sbin/sysinst/disklabel.c: revision 1.33
usr.sbin/sysinst/disklabel.c: revision 1.34
usr.sbin/sysinst/disks.c: revision 1.60
usr.sbin/sysinst/disks.c: revision 1.61
usr.sbin/sysinst/arch/bebox/md.c: revision 1.7
usr.sbin/sysinst/disks.c: revision 1.62
usr.sbin/sysinst/arch/bebox/md.c: revision 1.8
usr.sbin/sysinst/mbr.c: revision 1.30
usr.sbin/sysinst/partitions.c: revision 1.10
usr.sbin/sysinst/arch/prep/md.c: revision 1.11
usr.sbin/sysinst/arch/prep/md.c: revision 1.12
usr.sbin/sysinst/menus.pm: revision 1.3
usr.sbin/sysinst/main.c: revision 1.20
usr.sbin/sysinst/menus.mi: revision 1.20
usr.sbin/sysinst/menus.mi: revision 1.21
avoid calling snprintf/strlcat with an input parameter the same
as the output. from martin@. fixes gcc 8 restrict warnings.
Finish conversion of extended partitioning parts to new abstract
backend interface. XXX still could use a lot of polishing.
Instead of a (bogus) attempt to query the model via ofctl, use the (now
fixed) sysctl hw.model instead.
When reading the secondary disklabel partitions from an existing disklabel
set the mbr partitions as parent.
Move the LABELSECTOR check and make it FS type specific - some partition
types (FFS, RAID) are allowed to overlap with the LABELSECTOR.
When asked to create a whole-disk partition for unknown usage, do not only
assert(false), but actually return an error (in case "assert" is a nop).
PR install/54787: when trying to derive proper alignement and first offset
from exisiting partitions, use the first partition offset if it is already
closer to the start of the disk than the prefered alignment - we can not
move existing partitions around.
Fix handling of inner/outer partitions (e.g. MBR and disklabel) in
extended partitioning:
- when editing a disk with such a schme, offer both partitions in two
steps
- when commiting changes save the inner partitions after the outer ones
Add a method to query the partitioning schemes "internal idea" of a
cylinder size - whatever that means in the real world.
Avoid using the global "pm" variable in utility functions - during
extended partitioning they may point to a different device.
Remove useless calls to get_ramsize() - return value is ignored and
the function has no side effects.
Fix /tmp tmpfs handling and on machines with enough RAM default to
creating a /tmp tmpfs with 25% of ram size limit. Suggested by ad@.
PR install/54872: fix printf argument order, sectors and heads were
swapped in the bios geometry display.
First try to bring evbarm installation closer to current reality.
hide disklabel_non_bootable() under NO_DISKLABEL_BOOT like the usage.
should fix most builds.
Deal with even stranger fictious empty disklabels (PR kern/54882).
Factor out all RAM size thresholds as defines to avoid magic numbers.
To work around PR misc/54886 bump the threshold for a tmpfs /tmp mount
up to 256 MB.
When retrying sets during extraction, reset the relevant statistics
to avoid counting retried sets multiple times.
Reported by kim.
Fix support for non-512-byte/sector disks again after I broke it when
introducing the abstract partition backends.
Use a few strlcpy() instead of strncpy() for network ioctl structs.
We seem to have no formal documentation stating the various
char if*_name[IFNAMSIZ]; /* if name, e.g. "en0" */
elements in ioctls are nul terminated, but the peanut gallery claims
it is so - and at least half of the code in-tree touching them agrees.
Too much disklabel magic happening in the kernel - to compensate force
MBR first when trying to identify the existing partitioning scheme of
a disk.
diffstat:
usr.sbin/sysinst/arch/arc/md.c | 4 +-
usr.sbin/sysinst/arch/bebox/md.c | 4 +-
usr.sbin/sysinst/arch/cobalt/md.c | 4 +-
usr.sbin/sysinst/arch/evbarm/md.c | 215 ++++---
usr.sbin/sysinst/arch/evbarm/md.h | 40 +-
usr.sbin/sysinst/arch/evbmips/md.c | 4 +-
usr.sbin/sysinst/arch/evbppc/md.c | 4 +-
usr.sbin/sysinst/arch/hpcarm/md.c | 4 +-
usr.sbin/sysinst/arch/hpcmips/md.c | 4 +-
usr.sbin/sysinst/arch/hpcsh/md.c | 4 +-
usr.sbin/sysinst/arch/i386/md.c | 10 +-
usr.sbin/sysinst/arch/landisk/md.c | 4 +-
usr.sbin/sysinst/arch/luna68k/md.c | 8 +-
usr.sbin/sysinst/arch/ofppc/md.c | 12 +-
usr.sbin/sysinst/arch/playstation2/md.c | 6 +-
usr.sbin/sysinst/arch/prep/md.c | 4 +-
usr.sbin/sysinst/arch/sandpoint/md.c | 4 +-
usr.sbin/sysinst/arch/zaurus/md.c | 4 +-
usr.sbin/sysinst/bsddisklabel.c | 153 ++++-
usr.sbin/sysinst/defs.h | 69 +-
usr.sbin/sysinst/disklabel.c | 158 ++++-
usr.sbin/sysinst/disks.c | 94 +-
usr.sbin/sysinst/gpt.c | 68 +-
usr.sbin/sysinst/install.c | 4 +-
usr.sbin/sysinst/label.c | 61 +-
usr.sbin/sysinst/main.c | 3 +-
usr.sbin/sysinst/mbr.c | 185 +++++-
usr.sbin/sysinst/menus.mi | 26 +-
usr.sbin/sysinst/menus.pm | 261 ++++----
usr.sbin/sysinst/msg.mi.de | 15 +-
usr.sbin/sysinst/msg.mi.en | 11 +-
usr.sbin/sysinst/msg.mi.es | 11 +-
usr.sbin/sysinst/msg.mi.fr | 11 +-
usr.sbin/sysinst/msg.mi.pl | 11 +-
usr.sbin/sysinst/msg.pm.de | 12 +-
usr.sbin/sysinst/msg.pm.en | 6 +-
usr.sbin/sysinst/msg.pm.es | 6 +-
usr.sbin/sysinst/msg.pm.fr | 6 +-
usr.sbin/sysinst/msg.pm.pl | 6 +-
usr.sbin/sysinst/net.c | 8 +-
usr.sbin/sysinst/part_edit.c | 20 +-
usr.sbin/sysinst/partitions.c | 29 +-
usr.sbin/sysinst/partitions.h | 55 +-
usr.sbin/sysinst/partman.c | 932 ++++++++++++++++++++++---------
usr.sbin/sysinst/sizemultname.c | 25 +-
usr.sbin/sysinst/target.c | 6 +-
usr.sbin/sysinst/upgrade.c | 4 +-
usr.sbin/sysinst/util.c | 163 +++++-
48 files changed, 1847 insertions(+), 911 deletions(-)
diffs (truncated from 5522 to 300 lines):
diff -r e3b0e80997e0 -r 923279426a84 usr.sbin/sysinst/arch/arc/md.c
--- a/usr.sbin/sysinst/arch/arc/md.c Tue Jan 28 09:48:33 2020 +0000
+++ b/usr.sbin/sysinst/arch/arc/md.c Tue Jan 28 10:17:57 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.8.2.2 2019/12/17 09:44:50 msaitoh Exp $ */
+/* $NetBSD: md.c,v 1.8.2.3 2020/01/28 10:17:57 msaitoh Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -79,7 +79,7 @@
struct disk_partitions *parts =
(*ps->create_new_for_disk)(pm->diskdev,
- 0, pm->dlsize, pm->dlsize, true);
+ 0, pm->dlsize, true, NULL);
if (!parts)
return false;
diff -r e3b0e80997e0 -r 923279426a84 usr.sbin/sysinst/arch/bebox/md.c
--- a/usr.sbin/sysinst/arch/bebox/md.c Tue Jan 28 09:48:33 2020 +0000
+++ b/usr.sbin/sysinst/arch/bebox/md.c Tue Jan 28 10:17:57 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.5.2.1 2019/08/18 13:19:52 msaitoh Exp $ */
+/* $NetBSD: md.c,v 1.5.2.2 2020/01/28 10:17:59 msaitoh Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -72,7 +72,7 @@
struct disk_partitions *parts =
(*ps->create_new_for_disk)(pm->diskdev,
- 0, pm->dlsize, pm->dlsize, true);
+ 0, pm->dlsize, true, NULL);
if (!parts)
return false;
diff -r e3b0e80997e0 -r 923279426a84 usr.sbin/sysinst/arch/cobalt/md.c
--- a/usr.sbin/sysinst/arch/cobalt/md.c Tue Jan 28 09:48:33 2020 +0000
+++ b/usr.sbin/sysinst/arch/cobalt/md.c Tue Jan 28 10:17:57 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.8.2.2 2019/12/17 09:44:51 msaitoh Exp $ */
+/* $NetBSD: md.c,v 1.8.2.3 2020/01/28 10:17:57 msaitoh Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -79,7 +79,7 @@
struct disk_partitions *parts =
(*ps->create_new_for_disk)(pm->diskdev,
- 0, pm->dlsize, pm->dlsize, true);
+ 0, pm->dlsize, true, NULL);
if (!parts)
return false;
diff -r e3b0e80997e0 -r 923279426a84 usr.sbin/sysinst/arch/evbarm/md.c
--- a/usr.sbin/sysinst/arch/evbarm/md.c Tue Jan 28 09:48:33 2020 +0000
+++ b/usr.sbin/sysinst/arch/evbarm/md.c Tue Jan 28 10:17:57 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.8.2.2 2019/12/17 09:44:50 msaitoh Exp $ */
+/* $NetBSD: md.c,v 1.8.2.3 2020/01/28 10:17:58 msaitoh Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -42,6 +42,7 @@
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/param.h>
+#include <sys/sysctl.h>
#include "defs.h"
#include "md.h"
@@ -50,25 +51,43 @@
int boardtype = BOARD_TYPE_NORMAL;
+#define SBSA_MODEL_STR "netbsd,generic-acpi"
+#define RPI_MODEL_STR "raspberrypi,"
+
void
md_init(void)
{
- int rv;
+ static const int mib[2] = {CTL_HW, HW_MODEL};
+ size_t len;
+ char *cpu_model;
+
+ sysctl(mib, 2, NULL, &len, NULL, 0);
+ cpu_model = malloc(len);
+ sysctl(mib, 2, cpu_model, &len, NULL, 0);
- rv =run_program(RUN_SILENT|RUN_ERROR_OK, "sh -c 'ofctl -p / model | "
- "fgrep \"Raspberry Pi\"'");
- if (rv != 0)
- return;
+ if (strstr(cpu_model, RPI_MODEL_STR) != NULL)
+ /* this is some kind of Raspberry Pi */
+ boardtype = BOARD_TYPE_RPI;
+ else if (strstr(cpu_model, SBSA_MODEL_STR) != NULL)
+ /* some SBSA compatible machine */
+ boardtype = BOARD_TYPE_ACPI;
+ else
+ /* unknown, assume u-boot + dtb */
+ boardtype = BOARD_TYPE_NORMAL;
- /* this is some kind of Raspberry Pi */
- boardtype = BOARD_TYPE_RPI;
+ free(cpu_model);
}
void
md_init_set_status(int flags)
{
- if (boardtype == BOARD_TYPE_RPI)
- set_kernel_set(SET_KERNEL_RPI);
+
+ /*
+ * we will extract kernel variants and DTB files piecwise
+ * manually later, just fetch the kernel set, do not
+ * unpack it.
+ */
+ set_noextract_set(SET_KERNEL_1);
}
bool
@@ -88,7 +107,7 @@
struct disk_partitions *parts =
(*ps->create_new_for_disk)(pm->diskdev,
- 0, pm->dlsize, pm->dlsize, true);
+ 0, pm->dlsize, true, NULL);
if (!parts)
return false;
@@ -97,10 +116,7 @@
pm->dlsize = ps->size_limit;
}
- if (boardtype == BOARD_TYPE_RPI)
- return set_bios_geom_with_mbr_guess(pm->parts);
-
- return true;
+ return edit_outer_parts(pm->parts);
}
/*
@@ -120,16 +136,13 @@
{
size_t i;
- if (boardtype == BOARD_TYPE_NORMAL)
- return true;
- if (boardtype == BOARD_TYPE_RPI) {
- for (i = 0; i < install->num; i++)
- if (install->infos[i].fs_type == FS_MSDOS)
- return true;
+ for (i = 0; i < install->num; i++)
+ if (install->infos[i].fs_type == FS_MSDOS)
+ return true;
- msg_display(MSG_nomsdospart);
- process_menu(MENU_ok, NULL);
- }
+ msg_display(MSG_nomsdospart);
+ process_menu(MENU_ok, NULL);
+
return false;
}
@@ -181,13 +194,43 @@
}
int
-md_post_extract(struct install_partition_desc *install)
+evbarm_extract_finalize(int update)
{
+ distinfo *dist;
char kernelbin[100];
+ int (*saved_fetch_fn)(const char *);
+#ifdef _LP64
+#define EFIBOOT "/usr/mdec/bootaa64.efi"
+#else
+#define EFIBOOT "/usr/mdec/bootarm.efi"
+#endif
+
+ dist = get_set_distinfo(SET_KERNEL_1);
+ if (dist == NULL)
+ return 0;
- if (boardtype == BOARD_TYPE_NORMAL)
+ saved_fetch_fn = fetch_fn;
+ extract_file_to(dist, false, "/", "./netbsd", false);
+ fetch_fn = NULL;
+ make_target_dir("/boot/EFI/boot");
+ if (target_file_exists_p(EFIBOOT))
+ cp_within_target(EFIBOOT, "/boot/EFI/boot", 0);
+
+ if (boardtype == BOARD_TYPE_ACPI) {
+ fetch_fn = saved_fetch_fn;
return 0;
+ }
+ if (boardtype == BOARD_TYPE_NORMAL) {
+ make_target_dir("/boot/dtb");
+ extract_file_to(dist, false, "/boot/dtb", "*.dt*", false);
+ extract_file_to(dist, false, "/boot", "./netbsd.ub", false);
+ fetch_fn = saved_fetch_fn;
+ return 0;
+ }
if (boardtype == BOARD_TYPE_RPI) {
+ extract_file_to(dist, false, "/boot", "./netbsd.img", false);
+ extract_file_to(dist, false, "/boot", "./bcm*.dtb", false);
+ fetch_fn = saved_fetch_fn;
snprintf(kernelbin, 100, "%s/netbsd.img", targetroot_mnt);
if (file_exists_p(kernelbin)) {
run_program(RUN_DISPLAY,
@@ -198,6 +241,14 @@
return 1;
}
}
+ fetch_fn = saved_fetch_fn;
+ return 0;
+}
+
+int
+md_post_extract(struct install_partition_desc *install)
+{
+
return 0;
}
@@ -238,86 +289,36 @@
struct mbr_partition *part;
int i, hasboot=0;
- if (boardtype == BOARD_TYPE_NORMAL)
- return 2;
- /* raspi code */
- if (boardtype == BOARD_TYPE_RPI) {
- for (ext = mbri; ext; ext = ext->extended) {
- part = ext->mbr.mbr_parts;
- for (i=0, hasboot=0; i < MBR_PART_COUNT; part++, i++) {
- if (part->mbrp_type != MBR_PTYPE_FAT16L &&
- part->mbrp_type != MBR_PTYPE_FAT32L)
- continue;
- hasboot = 1;
- break;
- }
- }
- if (!hasboot) {
- if (quiet)
- return 2;
- msg_display(MSG_nomsdospart);
- return ask_reedit(parts);
+ for (ext = mbri; ext; ext = ext->extended) {
+ part = ext->mbr.mbr_parts;
+ for (i=0, hasboot=0; i < MBR_PART_COUNT; part++, i++) {
+ if (part->mbrp_type != MBR_PTYPE_FAT16L &&
+ part->mbrp_type != MBR_PTYPE_FAT32L)
+ continue;
+ hasboot = 1;
+ break;
}
}
+ if (!hasboot) {
+ if (quiet)
+ return 2;
+ msg_display(MSG_nomsdospart);
+ return ask_reedit(parts);
+ }
+
return 2;
}
bool
md_parts_use_wholedisk(struct disk_partitions *parts)
{
- part_id nbsd, boot;
- struct disk_part_info info;
- daddr_t offset;
-
- /*
- * XXX - set (U)EFI install depending on boardtype
- */
-
- if (boardtype == BOARD_TYPE_NORMAL) {
- /* this keeps it from creating /boot as msdos */
- pm->bootsize = 0;
- return parts_use_wholedisk(parts, 0, NULL);
- }
-
- /* raspi code */
- if (boardtype == BOARD_TYPE_RPI) {
-
- for (boot = 0; boot < parts->num_part; boot++) {
- if (!parts->pscheme->get_part_info(parts, boot, &info))
- continue;
- if (info.nat_type == NULL)
- continue;
- if (info.nat_type->generic_ptype == PT_FAT)
- break;
- }
Home |
Main Index |
Thread Index |
Old Index