CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src
Committed By: bouyer
Date: Sun Mar 24 20:27:04 UTC 2024
Modified Files:
src/usr.sbin/sysinst [netbsd-10]: gpt.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #645):
usr.sbin/sysinst/gpt.c: revision 1.32
PR 58061: fix bug in the GPT backend: when inserting a partition
(i.e. not adding it at the end) a bogus ID was returned for the new
partition.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.30.2.1 src/usr.sbin/sysinst/gpt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/gpt.c
diff -u src/usr.sbin/sysinst/gpt.c:1.30 src/usr.sbin/sysinst/gpt.c:1.30.2.1
--- src/usr.sbin/sysinst/gpt.c:1.30 Thu Dec 15 14:54:27 2022
+++ src/usr.sbin/sysinst/gpt.c Sun Mar 24 20:27:04 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: gpt.c,v 1.30 2022/12/15 14:54:27 martin Exp $ */
+/* $NetBSD: gpt.c,v 1.30.2.1 2024/03/24 20:27:04 bouyer Exp $ */
/*
* Copyright 2018 The NetBSD Foundation, Inc.
@@ -569,12 +569,14 @@ gpt_get_part_attr_str(const struct disk_
static bool
gpt_insert_part_into_list(struct gpt_disk_partitions *parts,
struct gpt_part_entry **list,
-struct gpt_part_entry *entry, const char **err_msg)
+struct gpt_part_entry *entry, const char **err_msg, part_id *new_id)
{
struct gpt_part_entry *p, *last;
+ part_id pno;
/* find the first entry past the new one (if any) */
- for (last = NULL, p = *list; p != NULL; last = p, p = p->gp_next) {
+ for (pno = 0, last = NULL, p = *list; p != NULL;
+ last = p, p = p->gp_next, pno++) {
if (p->gp_start > entry->gp_start)
break;
}
@@ -609,7 +611,8 @@ gpt_insert_part_into_list(struct gpt_dis
}
if (*list == NULL)
*list = entry;
-
+ if (new_id != NULL)
+ *new_id = pno;
return true;
}
@@ -651,7 +654,7 @@ gpt_set_part_info(struct disk_partitions
*n = *p;
p->gp_flags &= ~GPEF_ON_DISK;
if (!gpt_insert_part_into_list(parts, >obsolete,
- n, err_msg))
+ n, err_msg, NULL))
return false;
} else if (info->size != p->gp_size) {
p->gp_flags |= GPEF_RESIZED;
@@ -1076,6 +1079,7 @@ gpt_add_part(struct disk_partitions *arg
struct disk_part_free_space space;
struct disk_part_info data = *info;
struct gpt_part_entry *p, *n;
+ part_id pno;
bool ok;
if (err_msg != NULL)
@@ -1107,7 +,8 @@ gpt_add_part(struct disk_partitions *arg
return NO_PART;
}
p->gp_flags |= GPEF_MODIFIED;
- ok = gpt_insert_part_into_list(parts, >partitions, p, err_msg);
+ ok = gpt_insert_part_into_list(parts, >partitions, p,
+ err_msg, );
if (ok) {
if (info->flags & PTI_INSTALL_TARGET) {
/* update target mark - we can only have one */
@@ -1119,7 +1124,7 @@ gpt_add_part(struct disk_partitions *arg
parts->dp.num_part++;
parts->dp.free_space -= p->gp_size;
- return parts->dp.num_part-1;
+ return pno;
} else {
free(p);
return NO_PART;
@@ -1157,7 +1162,7 @@ gpt_delete_partition(struct disk_partiti
res = true;
if (p->gp_flags & GPEF_ON_DISK) {
if (!gpt_insert_part_into_list(parts, >obsolete,
- p, err_msg))
+ p, err_msg, NULL))
res = false;
} else {
free(p);
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src Committed By: bouyer Date: Sun Mar 24 20:27:04 UTC 2024 Modified Files: src/usr.sbin/sysinst [netbsd-10]: gpt.c Log Message: Pull up following revision(s) (requested by martin in ticket #645): usr.sbin/sysinst/gpt.c: revision 1.32 PR 58061: fix bug in the GPT backend: when inserting a partition (i.e. not adding it at the end) a bogus ID was returned for the new partition. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.30.2.1 src/usr.sbin/sysinst/gpt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src
Committed By: bouyer
Date: Sun Mar 24 20:26:14 UTC 2024
Modified Files:
src/usr.sbin/sysinst [netbsd-10]: configmenu.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #644):
usr.sbin/sysinst/configmenu.c: revision 1.19
PR 58062: fix a bug I introduced with the https support: update
the pkgsrc/binary pkgs download URL not only when https transport
is selected.
To generate a diff of this commit:
cvs rdiff -u -r1.17.2.1 -r1.17.2.2 src/usr.sbin/sysinst/configmenu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/configmenu.c
diff -u src/usr.sbin/sysinst/configmenu.c:1.17.2.1 src/usr.sbin/sysinst/configmenu.c:1.17.2.2
--- src/usr.sbin/sysinst/configmenu.c:1.17.2.1 Tue Dec 26 05:54:15 2023
+++ src/usr.sbin/sysinst/configmenu.c Sun Mar 24 20:26:14 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: configmenu.c,v 1.17.2.1 2023/12/26 05:54:15 snj Exp $ */
+/* $NetBSD: configmenu.c,v 1.17.2.2 2024/03/24 20:26:14 bouyer Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -340,12 +340,11 @@ set_binpkg(struct menudesc *menu, void *
* Make sure we have the TLS certs in a usable state
* (if target is a new installation)
*/
- if (pkg.xfer == XFER_HTTPS) {
+ if (pkg.xfer == XFER_HTTPS)
run_program(RUN_CHROOT | RUN_SILENT,
"/bin/sh /etc/rc.d/certctl_init onestart");
- make_url(pkgpath, , pkg_dir);
- }
+ make_url(pkgpath, , pkg_dir);
if (run_program(RUN_DISPLAY | RUN_PROGRESS | RUN_CHROOT,
"pkg_add %s/pkgin", pkgpath) == 0) {
allok = 1;
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src Committed By: bouyer Date: Sun Mar 24 20:26:14 UTC 2024 Modified Files: src/usr.sbin/sysinst [netbsd-10]: configmenu.c Log Message: Pull up following revision(s) (requested by martin in ticket #644): usr.sbin/sysinst/configmenu.c: revision 1.19 PR 58062: fix a bug I introduced with the https support: update the pkgsrc/binary pkgs download URL not only when https transport is selected. To generate a diff of this commit: cvs rdiff -u -r1.17.2.1 -r1.17.2.2 src/usr.sbin/sysinst/configmenu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src
Committed By: sborrill
Date: Wed Feb 14 15:08:29 UTC 2024
Modified Files:
src/usr.sbin/sysinst [netbsd-10]: label.c
Log Message:
Pull up the following revisions(s) (requested by martin in ticket #594):
usr.sbin/sysinst/label.c: revision 1.51
PR 57927: when comparing old and new partition state during renumbering,
ignore differences in the install target flag - the backend might have
flipped it off already to ensure only a single partition is marked
as install target.
To generate a diff of this commit:
cvs rdiff -u -r1.46.2.2 -r1.46.2.3 src/usr.sbin/sysinst/label.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/label.c
diff -u src/usr.sbin/sysinst/label.c:1.46.2.2 src/usr.sbin/sysinst/label.c:1.46.2.3
--- src/usr.sbin/sysinst/label.c:1.46.2.2 Sun Nov 26 12:40:50 2023
+++ src/usr.sbin/sysinst/label.c Wed Feb 14 15:08:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: label.c,v 1.46.2.2 2023/11/26 12:40:50 bouyer Exp $ */
+/* $NetBSD: label.c,v 1.46.2.3 2024/02/14 15:08:29 sborrill Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: label.c,v 1.46.2.2 2023/11/26 12:40:50 bouyer Exp $");
+__RCSID("$NetBSD: label.c,v 1.46.2.3 2024/02/14 15:08:29 sborrill Exp $");
#endif
#include
@@ -512,7 +512,8 @@ renumber_partitions(struct partition_usa
for (i = 0; i < pset->num; i++) {
if (pset->infos[i].cur_start != info.start)
continue;
- if (pset->infos[i].cur_flags != info.flags)
+ if ((pset->infos[i].cur_flags & ~PTI_INSTALL_TARGET)
+ != (info.flags & ~PTI_INSTALL_TARGET))
continue;
if ((info.fs_type != FS_UNUSED &&
info.fs_type == pset->infos[i].fs_type) ||
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src Committed By: sborrill Date: Wed Feb 14 15:08:29 UTC 2024 Modified Files: src/usr.sbin/sysinst [netbsd-10]: label.c Log Message: Pull up the following revisions(s) (requested by martin in ticket #594): usr.sbin/sysinst/label.c: revision 1.51 PR 57927: when comparing old and new partition state during renumbering, ignore differences in the install target flag - the backend might have flipped it off already to ensure only a single partition is marked as install target. To generate a diff of this commit: cvs rdiff -u -r1.46.2.2 -r1.46.2.3 src/usr.sbin/sysinst/label.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.sbin/sysinst/arch/atari
Module Name:src Committed By: martin Date: Sun Jan 14 13:22:15 UTC 2024 Modified Files: src/usr.sbin/sysinst/arch/atari [netbsd-10]: md.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #537): usr.sbin/sysinst/arch/atari/md.c: revision 1.11 Fix a typo of a kernel name on detecting a running machine type. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.10.2.1 src/usr.sbin/sysinst/arch/atari/md.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/sysinst/arch/atari/md.c diff -u src/usr.sbin/sysinst/arch/atari/md.c:1.10 src/usr.sbin/sysinst/arch/atari/md.c:1.10.2.1 --- src/usr.sbin/sysinst/arch/atari/md.c:1.10 Fri Dec 9 17:02:13 2022 +++ src/usr.sbin/sysinst/arch/atari/md.c Sun Jan 14 13:22:15 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.10 2022/12/09 17:02:13 martin Exp $ */ +/* $NetBSD: md.c,v 1.10.2.1 2024/01/14 13:22:15 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -73,7 +73,7 @@ md_init_set_status(int flags) set_kernel_set(SET_KERNEL_4); else if (strstr(instsys.version, "(MILAN-ISAIDE")) set_kernel_set(SET_KERNEL_5); - else if (strstr(instsys.version, "(MILAN_PCIIDE")) + else if (strstr(instsys.version, "(MILAN-PCIIDE")) set_kernel_set(SET_KERNEL_6); }
CVS commit: [netbsd-10] src/usr.sbin/sysinst/arch/atari
Module Name:src Committed By: martin Date: Sun Jan 14 13:22:15 UTC 2024 Modified Files: src/usr.sbin/sysinst/arch/atari [netbsd-10]: md.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #537): usr.sbin/sysinst/arch/atari/md.c: revision 1.11 Fix a typo of a kernel name on detecting a running machine type. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.10.2.1 src/usr.sbin/sysinst/arch/atari/md.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.sbin/sysinst/arch/evbarm
Module Name:src
Committed By: snj
Date: Tue Dec 26 05:58:02 UTC 2023
Modified Files:
src/usr.sbin/sysinst/arch/evbarm [netbsd-10]: msg.md.de msg.md.en
msg.md.es msg.md.fr msg.md.pl
Log Message:
Pull up following revision(s) (requested by martin in ticket #512):
usr.sbin/sysinst/arch/evbarm/msg.md.de: revision 1.2
usr.sbin/sysinst/arch/evbarm/msg.md.en: revision 1.3
usr.sbin/sysinst/arch/evbarm/msg.md.es: revision 1.2
usr.sbin/sysinst/arch/evbarm/msg.md.fr: revision 1.2
usr.sbin/sysinst/arch/evbarm/msg.md.pl: revision 1.2
Fix kernel set names (the code has been changed to only offer GENERIC
or GENERIC64 kernel sets, but the UI messages and translations have not
been adapted back then)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.38.1 src/usr.sbin/sysinst/arch/evbarm/msg.md.de \
src/usr.sbin/sysinst/arch/evbarm/msg.md.es \
src/usr.sbin/sysinst/arch/evbarm/msg.md.fr \
src/usr.sbin/sysinst/arch/evbarm/msg.md.pl
cvs rdiff -u -r1.2 -r1.2.6.1 src/usr.sbin/sysinst/arch/evbarm/msg.md.en
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/arch/evbarm/msg.md.de
diff -u src/usr.sbin/sysinst/arch/evbarm/msg.md.de:1.1 src/usr.sbin/sysinst/arch/evbarm/msg.md.de:1.1.38.1
--- src/usr.sbin/sysinst/arch/evbarm/msg.md.de:1.1 Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/evbarm/msg.md.de Tue Dec 26 05:58:02 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.1 2014/07/26 19:30:45 dholland Exp $ */
+/* $NetBSD: msg.md.de,v 1.1.38.1 2023/12/26 05:58:02 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -73,23 +73,7 @@ message arm32fspart
}
message set_kernel_1
-{Kernel (ADI_BRH)}
-message set_kernel_2
-{Kernel (INTERGRATOR)}
-message set_kernel_3
-{Kernel (IQ80310)}
-message set_kernel_4
-{Kernel (IQ80321)}
-message set_kernel_5
-{Kernel (MINI2440)}
-message set_kernel_6
-{Kernel (TEAMASA_NPWR)}
-message set_kernel_7
-{Kernel (TS7200)}
-message set_kernel_8
-{Kernel (RPI)}
-message set_kernel_9
-{Kernel (KUROBOX_PRO)}
+{Kernel}
message nomsdospart
{There is no MSDOS boot partition in the MBR partition table.}
Index: src/usr.sbin/sysinst/arch/evbarm/msg.md.es
diff -u src/usr.sbin/sysinst/arch/evbarm/msg.md.es:1.1 src/usr.sbin/sysinst/arch/evbarm/msg.md.es:1.1.38.1
--- src/usr.sbin/sysinst/arch/evbarm/msg.md.es:1.1 Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/evbarm/msg.md.es Tue Dec 26 05:58:02 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.es,v 1.1 2014/07/26 19:30:45 dholland Exp $ */
+/* $NetBSD: msg.md.es,v 1.1.38.1 2023/12/26 05:58:02 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -72,23 +72,7 @@ Compensación en %s):
}
message set_kernel_1
-{Núcleo (ADI_BRH)}
-message set_kernel_2
-{Núcleo (INTERGRATOR)}
-message set_kernel_3
-{Núcleo (IQ80310)}
-message set_kernel_4
-{Núcleo (IQ80321)}
-message set_kernel_5
-{Núcleo (MINI2440)}
-message set_kernel_6
-{Núcleo (TEAMASA_NPWR)}
-message set_kernel_7
-{Núcleo (TS7200)}
-message set_kernel_8
-{N\xfacleo (RPI)}
-message set_kernel_9
-{Núcleo (KUROBOX_PRO)}
+{Núcleo}
message nomsdospart
{There is no MSDOS boot partition in the MBR partition table.}
Index: src/usr.sbin/sysinst/arch/evbarm/msg.md.fr
diff -u src/usr.sbin/sysinst/arch/evbarm/msg.md.fr:1.1 src/usr.sbin/sysinst/arch/evbarm/msg.md.fr:1.1.38.1
--- src/usr.sbin/sysinst/arch/evbarm/msg.md.fr:1.1 Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/evbarm/msg.md.fr Tue Dec 26 05:58:02 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.fr,v 1.1 2014/07/26 19:30:45 dholland Exp $ */
+/* $NetBSD: msg.md.fr,v 1.1.38.1 2023/12/26 05:58:02 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -72,23 +72,7 @@ message arm32fspart
}
message set_kernel_1
-{Kernel (ADI_BRH)}
-message set_kernel_2
-{Kernel (INTERGRATOR)}
-message set_kernel_3
-{Kernel (IQ80310)}
-message set_kernel_4
-{Kernel (IQ80321)}
-message set_kernel_5
-{Kernel (MINI2440)}
-message set_kernel_6
-{Kernel (TEAMASA_NPWR)}
-message set_kernel_7
-{Kernel (TS7200)}
-message set_kernel_8
-{Kernel (RPI)}
-message set_kernel_9
-{Kernel (KUROBOX_PRO)}
+{Kernel}
message nomsdospart
{There is no MSDOS boot partition in the MBR partition table.}
Index: src/usr.sbin/sysinst/arch/evbarm/msg.md.pl
diff -u src/usr.sbin/sysinst/arch/evbarm/msg.md.pl:1.1 src/usr.sbin/sysinst/arch/evbarm/msg.md.pl:1.1.38.1
--- src/usr.sbin/sysinst/arch/evbarm/msg.md.pl:1.1 Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/evbarm/msg.md.pl Tue Dec 26 05:58:02 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.pl,v 1.1 2014/07/26 19:30:45 dholland Exp $ */
+/* $NetBSD: msg.md.pl,v 1.1.38.1 2023/12/26 05:58:02 snj Exp $ */
/* Based on english version: */
/* NetBSD: msg.md.en,v 1.2 2002/04/02 17:02:54 thorpej Exp */
@@ -71,23 +71,7 @@ message arm32fspart
}
message set_kernel_1
-{Kernel (ADI_BRH)}
CVS commit: [netbsd-10] src/usr.sbin/sysinst/arch/evbarm
Module Name:src Committed By: snj Date: Tue Dec 26 05:58:02 UTC 2023 Modified Files: src/usr.sbin/sysinst/arch/evbarm [netbsd-10]: msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl Log Message: Pull up following revision(s) (requested by martin in ticket #512): usr.sbin/sysinst/arch/evbarm/msg.md.de: revision 1.2 usr.sbin/sysinst/arch/evbarm/msg.md.en: revision 1.3 usr.sbin/sysinst/arch/evbarm/msg.md.es: revision 1.2 usr.sbin/sysinst/arch/evbarm/msg.md.fr: revision 1.2 usr.sbin/sysinst/arch/evbarm/msg.md.pl: revision 1.2 Fix kernel set names (the code has been changed to only offer GENERIC or GENERIC64 kernel sets, but the UI messages and translations have not been adapted back then) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.38.1 src/usr.sbin/sysinst/arch/evbarm/msg.md.de \ src/usr.sbin/sysinst/arch/evbarm/msg.md.es \ src/usr.sbin/sysinst/arch/evbarm/msg.md.fr \ src/usr.sbin/sysinst/arch/evbarm/msg.md.pl cvs rdiff -u -r1.2 -r1.2.6.1 src/usr.sbin/sysinst/arch/evbarm/msg.md.en Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src
Committed By: snj
Date: Tue Dec 26 05:54:16 UTC 2023
Modified Files:
src/usr.sbin/sysinst [netbsd-10]: configmenu.c defs.h main.c
menus.entropy menus.mi net.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #511):
usr.sbin/sysinst/configmenu.c: revision 1.18
usr.sbin/sysinst/defs.h: revision 1.90
usr.sbin/sysinst/main.c: revision 1.32
usr.sbin/sysinst/menus.entropy: revision 1.3
usr.sbin/sysinst/menus.mi: revision 1.29
usr.sbin/sysinst/net.c: revision 1.45
Add a https transfer method (sharing all host details with the http
transfer). Make this method the default for all downloads.
Try to make sure the binary pkg installation (which runs in a chroot
in the already installed system) can make use of SSL verification.
This does NOT fix the missing SSL verification in most install media
even if using https (due to not fully populated /etc/openssl/certs).
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.2.1 src/usr.sbin/sysinst/configmenu.c
cvs rdiff -u -r1.88 -r1.88.2.1 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.30.2.1 -r1.30.2.2 src/usr.sbin/sysinst/main.c
cvs rdiff -u -r1.2 -r1.2.2.1 src/usr.sbin/sysinst/menus.entropy
cvs rdiff -u -r1.27.2.1 -r1.27.2.2 src/usr.sbin/sysinst/menus.mi
cvs rdiff -u -r1.43.2.1 -r1.43.2.2 src/usr.sbin/sysinst/net.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/configmenu.c
diff -u src/usr.sbin/sysinst/configmenu.c:1.17 src/usr.sbin/sysinst/configmenu.c:1.17.2.1
--- src/usr.sbin/sysinst/configmenu.c:1.17 Wed May 18 16:39:03 2022
+++ src/usr.sbin/sysinst/configmenu.c Tue Dec 26 05:54:15 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: configmenu.c,v 1.17 2022/05/18 16:39:03 martin Exp $ */
+/* $NetBSD: configmenu.c,v 1.17.2.1 2023/12/26 05:54:15 snj Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -324,6 +324,9 @@ set_binpkg(struct menudesc *menu, void *
int allok = 0;
arg_rv parm;
+ if (config_network(0))
+ mnt_net_config();
+
do {
parm.rv = -1;
parm.arg = additional_pkgs;
@@ -333,7 +336,16 @@ set_binpkg(struct menudesc *menu, void *
return 0;
}
- make_url(pkgpath, , pkg_dir);
+ /*
+ * Make sure we have the TLS certs in a usable state
+ * (if target is a new installation)
+ */
+ if (pkg.xfer == XFER_HTTPS) {
+ run_program(RUN_CHROOT | RUN_SILENT,
+ "/bin/sh /etc/rc.d/certctl_init onestart");
+ make_url(pkgpath, , pkg_dir);
+ }
+
if (run_program(RUN_DISPLAY | RUN_PROGRESS | RUN_CHROOT,
"pkg_add %s/pkgin", pkgpath) == 0) {
allok = 1;
Index: src/usr.sbin/sysinst/defs.h
diff -u src/usr.sbin/sysinst/defs.h:1.88 src/usr.sbin/sysinst/defs.h:1.88.2.1
--- src/usr.sbin/sysinst/defs.h:1.88 Thu Dec 15 15:32:04 2022
+++ src/usr.sbin/sysinst/defs.h Tue Dec 26 05:54:15 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.88 2022/12/15 15:32:04 martin Exp $ */
+/* $NetBSD: defs.h,v 1.88.2.1 2023/12/26 05:54:15 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -599,10 +599,13 @@ extern const char *ushell;
#define XFER_FTP 0
#define XFER_HTTP 1
-#define XFER_MAX XFER_HTTP
+#define XFER_HTTPS 2
+#define XFER_MAX XFER_HTTPS
+#define XFER_HOST_MAX XFER_HTTP /* http and https share a server name */
+#define XFER_HOST(XFER) ((XFER) == XFER_FTP ? 0 : 1)
struct ftpinfo {
- char xfer_host[XFER_MAX+1][STRSIZE];
+ char xfer_host[XFER_HOST_MAX+1][STRSIZE];
char dir[STRSIZE] ;
char user[SSTRSIZE];
char pass[STRSIZE];
Index: src/usr.sbin/sysinst/main.c
diff -u src/usr.sbin/sysinst/main.c:1.30.2.1 src/usr.sbin/sysinst/main.c:1.30.2.2
--- src/usr.sbin/sysinst/main.c:1.30.2.1 Fri Jun 23 05:40:02 2023
+++ src/usr.sbin/sysinst/main.c Tue Dec 26 05:54:16 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.30.2.1 2023/06/23 05:40:02 msaitoh Exp $ */
+/* $NetBSD: main.c,v 1.30.2.2 2023/12/26 05:54:16 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -132,8 +132,8 @@ static const struct f_arg fflagopts[] =
{"xfer dir", "/usr/INSTALL", xfer_dir, sizeof xfer_dir},
{"ext dir", "", ext_dir_bin, sizeof ext_dir_bin},
{"ext src dir", "", ext_dir_src, sizeof ext_dir_src},
- {"ftp host", SYSINST_FTP_HOST, ftp.xfer_host[XFER_FTP], sizeof ftp.xfer_host[XFER_FTP]},
- {"http host", SYSINST_HTTP_HOST, ftp.xfer_host[XFER_HTTP], sizeof ftp.xfer_host[XFER_HTTP]},
+ {"ftp host", SYSINST_FTP_HOST, ftp.xfer_host[XFER_HOST(XFER_FTP)], sizeof ftp.xfer_host[XFER_HOST(XFER_FTP)]},
+ {"http host", SYSINST_HTTP_HOST, ftp.xfer_host[XFER_HOST(XFER_HTTP)], sizeof ftp.xfer_host[XFER_HOST(XFER_HTTP)]},
{"ftp dir", SYSINST_FTP_DIR, ftp.dir, sizeof ftp.dir},
{"ftp prefix", "/" ARCH_SUBDIR "/binary/sets", set_dir_bin, sizeof set_dir_bin},
{"ftp src prefix", "/source/sets", set_dir_src, sizeof set_dir_src},
@@ -150,15 +150,15 @@ static const struct f_arg fflagopts[] =
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src Committed By: snj Date: Tue Dec 26 05:54:16 UTC 2023 Modified Files: src/usr.sbin/sysinst [netbsd-10]: configmenu.c defs.h main.c menus.entropy menus.mi net.c Log Message: Pull up following revision(s) (requested by martin in ticket #511): usr.sbin/sysinst/configmenu.c: revision 1.18 usr.sbin/sysinst/defs.h: revision 1.90 usr.sbin/sysinst/main.c: revision 1.32 usr.sbin/sysinst/menus.entropy: revision 1.3 usr.sbin/sysinst/menus.mi: revision 1.29 usr.sbin/sysinst/net.c: revision 1.45 Add a https transfer method (sharing all host details with the http transfer). Make this method the default for all downloads. Try to make sure the binary pkg installation (which runs in a chroot in the already installed system) can make use of SSL verification. This does NOT fix the missing SSL verification in most install media even if using https (due to not fully populated /etc/openssl/certs). To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.17.2.1 src/usr.sbin/sysinst/configmenu.c cvs rdiff -u -r1.88 -r1.88.2.1 src/usr.sbin/sysinst/defs.h cvs rdiff -u -r1.30.2.1 -r1.30.2.2 src/usr.sbin/sysinst/main.c cvs rdiff -u -r1.2 -r1.2.2.1 src/usr.sbin/sysinst/menus.entropy cvs rdiff -u -r1.27.2.1 -r1.27.2.2 src/usr.sbin/sysinst/menus.mi cvs rdiff -u -r1.43.2.1 -r1.43.2.2 src/usr.sbin/sysinst/net.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src Committed By: snj Date: Tue Nov 28 16:19:51 UTC 2023 Modified Files: src/usr.sbin/sysinst [netbsd-10]: Makefile.inc Log Message: Pull up following revision(s) (requested by martin in ticket #479): usr.sbin/sysinst/Makefile.inc: revision 1.47 PR 57729: clean up PKG_PATH for official RC (and similar) versions, like we do for the daily builds. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.45.2.1 src/usr.sbin/sysinst/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src
Committed By: snj
Date: Tue Nov 28 16:19:51 UTC 2023
Modified Files:
src/usr.sbin/sysinst [netbsd-10]: Makefile.inc
Log Message:
Pull up following revision(s) (requested by martin in ticket #479):
usr.sbin/sysinst/Makefile.inc: revision 1.47
PR 57729: clean up PKG_PATH for official RC (and similar) versions,
like we do for the daily builds.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.45.2.1 src/usr.sbin/sysinst/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/Makefile.inc
diff -u src/usr.sbin/sysinst/Makefile.inc:1.45 src/usr.sbin/sysinst/Makefile.inc:1.45.2.1
--- src/usr.sbin/sysinst/Makefile.inc:1.45 Sun Jan 9 16:39:50 2022
+++ src/usr.sbin/sysinst/Makefile.inc Tue Nov 28 16:19:51 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.45 2022/01/09 16:39:50 martin Exp $
+# $NetBSD: Makefile.inc,v 1.45.2.1 2023/11/28 16:19:51 snj Exp $
#
# Makefile for sysinst
@@ -106,6 +106,8 @@ CPPFLAGS+= -DPKG_ARCH_SUBDIR="\"${MACHIN
.if defined(NETBSD_OFFICIAL_RELEASE) && ${NETBSD_OFFICIAL_RELEASE} == "yes"
CPPFLAGS+= -DSYSINST_FTP_HOST=\"ftp.NetBSD.org\" -DNETBSD_OFFICIAL_RELEASE
CPPFLAGS+= -DSYSINST_HTTP_HOST=\"cdn.NetBSD.org\" -DNETBSD_OFFICIAL_RELEASE
+CPPFLAGS+= -DREL_PATH=\"netbsd-${DISTRIBVER:C/\.[0-9][_A-Z]*[0-9]*$//:S/./-/}\"
+CPPFLAGS+= -DPKG_SUBDIR="\"${DISTRIBVER:C/_.*$//}\""
.else
CPPFLAGS+= -DSYSINST_FTP_HOST=\"nyftp.NetBSD.org\"
CPPFLAGS+= -DSYSINST_HTTP_HOST=\"nycdn.NetBSD.org\"
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src
Committed By: bouyer
Date: Sun Nov 26 12:53:08 UTC 2023
Modified Files:
src/usr.sbin/sysinst [netbsd-10]: partman.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #474):
usr.sbin/sysinst/partman.c: revision 1.57
PR 57698: avoid a few potential sysinst crashes in environments where
not all binaries are available - e.g. w/o cgdconfig(8) the "cgds" pointer
would be NULL (as there can't be any) and we crashed when naively
dereferencing it.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.56.2.1 src/usr.sbin/sysinst/partman.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/partman.c
diff -u src/usr.sbin/sysinst/partman.c:1.56 src/usr.sbin/sysinst/partman.c:1.56.2.1
--- src/usr.sbin/sysinst/partman.c:1.56 Sun Jul 10 10:52:41 2022
+++ src/usr.sbin/sysinst/partman.c Sun Nov 26 12:53:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: partman.c,v 1.56 2022/07/10 10:52:41 martin Exp $ */
+/* $NetBSD: partman.c,v 1.56.2.1 2023/11/26 12:53:07 bouyer Exp $ */
/*
* Copyright 2012 Eugene Lozovoy
@@ -817,6 +817,8 @@ pm_raid_commit(void)
FILE *f;
char f_name[STRSIZE], devname[STRSIZE];
+ if (!have_raid)
+ return 0;
for (i = 0; i < MAX_RAID; i++) {
if (! pm_raid_check([i]))
continue;
@@ -1163,6 +1165,8 @@ pm_vnd_commit(void)
part_id id, part_suit = NO_PART;
struct disk_part_info info;
+ if (!have_vnd)
+ return 0;
for (i = 0; i < MAX_VND; i++) {
error = 0;
if (! pm_vnd_check([i]))
@@ -1454,6 +1458,8 @@ pm_cgd_commit(void)
char devname[STRSIZE];
int i, error = 0;
+ if (!have_cgd)
+ return 0;
for (i = 0; i < MAX_CGD; i++) {
if (! pm_cgd_check([i]))
continue;
@@ -1979,6 +1985,8 @@ pm_lvm_commit(void)
uint used_size = 0;
char params[STRSIZE*3], devs[STRSIZE*3], arg[STRSIZE];
+ if (!have_lvm)
+ return 0;
for (i = 0; i < MAX_LVM_VG; i++) {
/* Stage 0: checks */
if (! pm_lvm_check([i]))
@@ -2118,7 +2126,7 @@ pm_getrefdev(struct pm_devs *pm_cur)
char descr[MENUSTRSIZE], dev[MENUSTRSIZE] = "";
pm_cur->refdev = NULL;
- if (! strncmp(pm_cur->diskdev, "cgd", 3)) {
+ if (have_cgd && strncmp(pm_cur->diskdev, "cgd", 3) == 0) {
dev_num = pm_cur->diskdev[3] - '0';
for (i = 0; i < MAX_CGD; i++)
if (cgds[i].blocked && cgds[i].node == dev_num) {
@@ -2130,7 +2138,7 @@ pm_getrefdev(struct pm_devs *pm_cur)
sizeof(pm_cur->diskdev_descr));
break;
}
- } else if (! strncmp(pm_cur->diskdev, "vnd", 3)) {
+ } else if (have_vnd && strncmp(pm_cur->diskdev, "vnd", 3) == 0) {
dev_num = pm_cur->diskdev[3] - '0';
for (i = 0; i < MAX_VND; i++)
if (vnds[i].blocked && vnds[i].node == dev_num) {
@@ -2145,7 +2153,7 @@ pm_getrefdev(struct pm_devs *pm_cur)
sizeof(pm_cur->diskdev_descr));
break;
}
- } else if (! strncmp(pm_cur->diskdev, "raid", 4)) {
+ } else if (have_raid && strncmp(pm_cur->diskdev, "raid", 4) == 0) {
dev_num = pm_cur->diskdev[4] - '0';
for (i = 0; i < MAX_RAID; i++)
if (raids[i].blocked && raids[i].node == dev_num) {
@@ -2237,7 +2245,7 @@ pm_partusage(struct pm_devs *pm_cur, int
if (id >= pm_cur->parts->num_part)
return 0;
- for (i = 0; i < MAX_CGD; i++)
+ for (i = 0; have_cgd && i < MAX_CGD; i++)
if (cgds[i].enabled &&
cgds[i].pm == pm_cur &&
cgds[i].pm_part == id) {
@@ -2247,7 +2255,7 @@ pm_partusage(struct pm_devs *pm_cur, int
}
return 1;
}
- for (i = 0; i < MAX_RAID; i++)
+ for (i = 0; have_raid && i < MAX_RAID; i++)
for (ii = 0; ii < MAX_IN_RAID; ii++)
if (raids[i].enabled &&
raids[i].comp[ii].parts == pm_cur->parts &&
@@ -2256,7 +2264,7 @@ pm_partusage(struct pm_devs *pm_cur, int
raids[i].comp[ii].parts = NULL;
return 1;
}
- for (i = 0; i < MAX_LVM_VG; i++)
+ for (i = 0; have_lvm && i < MAX_LVM_VG; i++)
for (ii = 0; ii < MAX_LVM_PV; ii++)
if (lvms[i].enabled &&
lvms[i].pv[ii].pm == pm_cur &&
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src Committed By: bouyer Date: Sun Nov 26 12:53:08 UTC 2023 Modified Files: src/usr.sbin/sysinst [netbsd-10]: partman.c Log Message: Pull up following revision(s) (requested by martin in ticket #474): usr.sbin/sysinst/partman.c: revision 1.57 PR 57698: avoid a few potential sysinst crashes in environments where not all binaries are available - e.g. w/o cgdconfig(8) the "cgds" pointer would be NULL (as there can't be any) and we crashed when naively dereferencing it. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.56.2.1 src/usr.sbin/sysinst/partman.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src Committed By: bouyer Date: Sun Nov 26 12:40:50 UTC 2023 Modified Files: src/usr.sbin/sysinst [netbsd-10]: label.c util.c Log Message: Pull up following revision(s) (requested by martin in ticket #471): usr.sbin/sysinst/label.c: revision 1.50 usr.sbin/sysinst/util.c: revision 1.74 Force alignment of disk buffers to at least 8 byte. Fixes PR 56434. To generate a diff of this commit: cvs rdiff -u -r1.46.2.1 -r1.46.2.2 src/usr.sbin/sysinst/label.c cvs rdiff -u -r1.71.2.1 -r1.71.2.2 src/usr.sbin/sysinst/util.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src
Committed By: bouyer
Date: Sun Nov 26 12:40:50 UTC 2023
Modified Files:
src/usr.sbin/sysinst [netbsd-10]: label.c util.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #471):
usr.sbin/sysinst/label.c: revision 1.50
usr.sbin/sysinst/util.c: revision 1.74
Force alignment of disk buffers to at least 8 byte.
Fixes PR 56434.
To generate a diff of this commit:
cvs rdiff -u -r1.46.2.1 -r1.46.2.2 src/usr.sbin/sysinst/label.c
cvs rdiff -u -r1.71.2.1 -r1.71.2.2 src/usr.sbin/sysinst/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/label.c
diff -u src/usr.sbin/sysinst/label.c:1.46.2.1 src/usr.sbin/sysinst/label.c:1.46.2.2
--- src/usr.sbin/sysinst/label.c:1.46.2.1 Thu Nov 2 14:08:17 2023
+++ src/usr.sbin/sysinst/label.c Sun Nov 26 12:40:50 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: label.c,v 1.46.2.1 2023/11/02 14:08:17 sborrill Exp $ */
+/* $NetBSD: label.c,v 1.46.2.2 2023/11/26 12:40:50 bouyer Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: label.c,v 1.46.2.1 2023/11/02 14:08:17 sborrill Exp $");
+__RCSID("$NetBSD: label.c,v 1.46.2.2 2023/11/26 12:40:50 bouyer Exp $");
#endif
#include
@@ -1965,7 +1965,7 @@ const char *
get_last_mounted(int fd, daddr_t partstart, uint *fs_type, uint *fs_sub_type,
uint flags)
{
- static char sblk[SBLOCKSIZE]; /* is this enough? */
+ static char sblk[SBLOCKSIZE] __aligned(8); /* is this enough? */
struct fs *SB = (struct fs *)sblk;
static const off_t sblocks[] = SBLOCKSEARCH;
const off_t *sbp;
Index: src/usr.sbin/sysinst/util.c
diff -u src/usr.sbin/sysinst/util.c:1.71.2.1 src/usr.sbin/sysinst/util.c:1.71.2.2
--- src/usr.sbin/sysinst/util.c:1.71.2.1 Sat Sep 9 14:50:15 2023
+++ src/usr.sbin/sysinst/util.c Sun Nov 26 12:40:50 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.71.2.1 2023/09/09 14:50:15 martin Exp $ */
+/* $NetBSD: util.c,v 1.71.2.2 2023/11/26 12:40:50 bouyer Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -398,7 +398,7 @@ static int
get_iso9660_volname(int dev, int sess, char *volname, size_t volnamelen)
{
int blkno, error, last;
- char buf[ISO_BLKSIZE];
+ static char buf[ISO_BLKSIZE] __aligned(8);
struct iso_volume_descriptor *vd = NULL;
struct iso_primary_descriptor *pd = NULL;
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src Committed By: sborrill Date: Thu Nov 2 14:12:03 UTC 2023 Modified Files: src/usr.sbin/sysinst [netbsd-10]: msg.mi.de Log Message: Pull up the following revisions(s) (requested by martin in ticket #443): usr.sbin/sysinst/msg.mi.de: revision 1.45 Shorten the Use_Different_Part_Scheme message - the old version could overflow a 80 wide char display with some partitioning schemes (e.g. disklabel). To generate a diff of this commit: cvs rdiff -u -r1.43.2.1 -r1.43.2.2 src/usr.sbin/sysinst/msg.mi.de Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src
Committed By: sborrill
Date: Thu Nov 2 14:12:03 UTC 2023
Modified Files:
src/usr.sbin/sysinst [netbsd-10]: msg.mi.de
Log Message:
Pull up the following revisions(s) (requested by martin in ticket #443):
usr.sbin/sysinst/msg.mi.de: revision 1.45
Shorten the Use_Different_Part_Scheme message - the old version could
overflow a 80 wide char display with some partitioning schemes (e.g.
disklabel).
To generate a diff of this commit:
cvs rdiff -u -r1.43.2.1 -r1.43.2.2 src/usr.sbin/sysinst/msg.mi.de
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/msg.mi.de
diff -u src/usr.sbin/sysinst/msg.mi.de:1.43.2.1 src/usr.sbin/sysinst/msg.mi.de:1.43.2.2
--- src/usr.sbin/sysinst/msg.mi.de:1.43.2.1 Thu Nov 2 14:08:17 2023
+++ src/usr.sbin/sysinst/msg.mi.de Thu Nov 2 14:12:03 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.43.2.1 2023/11/02 14:08:17 sborrill Exp $ */
+/* $NetBSD: msg.mi.de,v 1.43.2.2 2023/11/02 14:12:03 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1120,7 +1120,7 @@ message Use_Empty_Parts {Partitionen fre
* $1 = short version of $0 MBR
*/
message Use_Different_Part_Scheme
-{Alles löschen, anderes Partitionierungsverfahren statt $1 verwenden}
+{Alles löschen, anders partitionieren (statt $1)}
message Gigabytes {Gigabyte}
message Megabytes {Megabyte}
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src
Committed By: sborrill
Date: Thu Nov 2 14:08:17 UTC 2023
Modified Files:
src/usr.sbin/sysinst [netbsd-10]: label.c msg.mi.de msg.mi.en msg.mi.es
msg.mi.fr msg.mi.pl
Log Message:
Pull up the following revisions(s) (requested by martin in ticket #442):
usr.sbin/sysinst/label.c: revision 1.49
usr.sbin/sysinst/msg.mi.de: revision 1.44
usr.sbin/sysinst/msg.mi.en: revision 1.47
usr.sbin/sysinst/msg.mi.es: revision 1.40
usr.sbin/sysinst/msg.mi.fr: revision 1.45
usr.sbin/sysinst/msg.mi.pl: revision 1.46
Switch to "-" (single minus) as input denotation for "no mount point"
in all translations and adjust the code accordingly.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.46.2.1 src/usr.sbin/sysinst/label.c \
src/usr.sbin/sysinst/msg.mi.en
cvs rdiff -u -r1.43 -r1.43.2.1 src/usr.sbin/sysinst/msg.mi.de
cvs rdiff -u -r1.39 -r1.39.2.1 src/usr.sbin/sysinst/msg.mi.es
cvs rdiff -u -r1.44 -r1.44.2.1 src/usr.sbin/sysinst/msg.mi.fr
cvs rdiff -u -r1.45 -r1.45.2.1 src/usr.sbin/sysinst/msg.mi.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/label.c
diff -u src/usr.sbin/sysinst/label.c:1.46 src/usr.sbin/sysinst/label.c:1.46.2.1
--- src/usr.sbin/sysinst/label.c:1.46 Thu Dec 15 20:21:16 2022
+++ src/usr.sbin/sysinst/label.c Thu Nov 2 14:08:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: label.c,v 1.46 2022/12/15 20:21:16 martin Exp $ */
+/* $NetBSD: label.c,v 1.46.2.1 2023/11/02 14:08:17 sborrill Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: label.c,v 1.46 2022/12/15 20:21:16 martin Exp $");
+__RCSID("$NetBSD: label.c,v 1.46.2.1 2023/11/02 14:08:17 sborrill Exp $");
#endif
#include
@@ -441,7 +441,7 @@ edit_fs_mountpt(menudesc *m, void *arg)
if (last != NULL)
last[1] = 0;
- if (first == NULL || *first == 0 || strcmp(first, "none") == 0) {
+ if (first == NULL || *first == 0 || strcmp(first, "-") == 0) {
edit->wanted->mount[0] = 0;
edit->wanted->instflags &= ~PUIINST_MOUNT;
return 0;
@@ -454,6 +454,7 @@ edit_fs_mountpt(menudesc *m, void *arg)
} else {
strlcpy(edit->wanted->mount, first, sizeof edit->wanted->mount);
}
+ edit->wanted->instflags |= PUIINST_MOUNT;
return 0;
}
Index: src/usr.sbin/sysinst/msg.mi.en
diff -u src/usr.sbin/sysinst/msg.mi.en:1.46 src/usr.sbin/sysinst/msg.mi.en:1.46.2.1
--- src/usr.sbin/sysinst/msg.mi.en:1.46 Thu Dec 15 15:32:04 2022
+++ src/usr.sbin/sysinst/msg.mi.en Thu Nov 2 14:08:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.46 2022/12/15 15:32:04 martin Exp $ */
+/* $NetBSD: msg.mi.en,v 1.46.2.1 2023/11/02 14:08:17 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -143,7 +143,7 @@ message sectors
{sectors}
message mountpoint
-{mount point (or 'none')}
+{mount point (or '-')}
message cylname
{cyl}
Index: src/usr.sbin/sysinst/msg.mi.de
diff -u src/usr.sbin/sysinst/msg.mi.de:1.43 src/usr.sbin/sysinst/msg.mi.de:1.43.2.1
--- src/usr.sbin/sysinst/msg.mi.de:1.43 Thu Dec 15 15:32:04 2022
+++ src/usr.sbin/sysinst/msg.mi.de Thu Nov 2 14:08:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.43 2022/12/15 15:32:04 martin Exp $ */
+/* $NetBSD: msg.mi.de,v 1.43.2.1 2023/11/02 14:08:17 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -152,7 +152,7 @@ message sectors
{Sektoren}
message mountpoint
-{Mountpoint (oder 'kein(e)'))}
+{Mountpoint (oder '-')}
message cylname
{Zyl}
Index: src/usr.sbin/sysinst/msg.mi.es
diff -u src/usr.sbin/sysinst/msg.mi.es:1.39 src/usr.sbin/sysinst/msg.mi.es:1.39.2.1
--- src/usr.sbin/sysinst/msg.mi.es:1.39 Thu Dec 15 15:32:04 2022
+++ src/usr.sbin/sysinst/msg.mi.es Thu Nov 2 14:08:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.39 2022/12/15 15:32:04 martin Exp $ */
+/* $NetBSD: msg.mi.es,v 1.39.2.1 2023/11/02 14:08:17 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -150,7 +150,7 @@ message sectors
{sectores}
message mountpoint
-{punto de montaje (o 'ninguno')}
+{punto de montaje (o '-')}
message cylname
{cil}
Index: src/usr.sbin/sysinst/msg.mi.fr
diff -u src/usr.sbin/sysinst/msg.mi.fr:1.44 src/usr.sbin/sysinst/msg.mi.fr:1.44.2.1
--- src/usr.sbin/sysinst/msg.mi.fr:1.44 Thu Dec 15 15:32:04 2022
+++ src/usr.sbin/sysinst/msg.mi.fr Thu Nov 2 14:08:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.fr,v 1.44 2022/12/15 15:32:04 martin Exp $ */
+/* $NetBSD: msg.mi.fr,v 1.44.2.1 2023/11/02 14:08:17 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -152,7 +152,7 @@ message sectors
{secteurs}
message mountpoint
-{point de montage (ou 'aucun')}
+{point de montage (ou '-')}
message cylname
{cyl}
Index: src/usr.sbin/sysinst/msg.mi.pl
diff -u src/usr.sbin/sysinst/msg.mi.pl:1.45
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src Committed By: sborrill Date: Thu Nov 2 14:08:17 UTC 2023 Modified Files: src/usr.sbin/sysinst [netbsd-10]: label.c msg.mi.de msg.mi.en msg.mi.es msg.mi.fr msg.mi.pl Log Message: Pull up the following revisions(s) (requested by martin in ticket #442): usr.sbin/sysinst/label.c: revision 1.49 usr.sbin/sysinst/msg.mi.de: revision 1.44 usr.sbin/sysinst/msg.mi.en: revision 1.47 usr.sbin/sysinst/msg.mi.es: revision 1.40 usr.sbin/sysinst/msg.mi.fr: revision 1.45 usr.sbin/sysinst/msg.mi.pl: revision 1.46 Switch to "-" (single minus) as input denotation for "no mount point" in all translations and adjust the code accordingly. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.46.2.1 src/usr.sbin/sysinst/label.c \ src/usr.sbin/sysinst/msg.mi.en cvs rdiff -u -r1.43 -r1.43.2.1 src/usr.sbin/sysinst/msg.mi.de cvs rdiff -u -r1.39 -r1.39.2.1 src/usr.sbin/sysinst/msg.mi.es cvs rdiff -u -r1.44 -r1.44.2.1 src/usr.sbin/sysinst/msg.mi.fr cvs rdiff -u -r1.45 -r1.45.2.1 src/usr.sbin/sysinst/msg.mi.pl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Sat Sep 9 14:50:15 UTC 2023
Modified Files:
src/usr.sbin/sysinst [netbsd-10]: util.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #358):
usr.sbin/sysinst/util.c: revision 1.73
sysinst(1): Run `certctl rehash' on fresh installs.
It has come to my attention that sysinst does not, in fact, run
postinstall(8) post-install -- only post-upgrade.
Perhaps we should change this so that postinstall serves the purpose
it says on the box -- make postinstall mandatory for new
installations.
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.71.2.1 src/usr.sbin/sysinst/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/util.c
diff -u src/usr.sbin/sysinst/util.c:1.71 src/usr.sbin/sysinst/util.c:1.71.2.1
--- src/usr.sbin/sysinst/util.c:1.71 Thu Dec 15 20:34:46 2022
+++ src/usr.sbin/sysinst/util.c Sat Sep 9 14:50:15 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.71 2022/12/15 20:34:46 martin Exp $ */
+/* $NetBSD: util.c,v 1.71.2.1 2023/09/09 14:50:15 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1524,8 +1524,13 @@ get_and_unpack_sets(int update, msg setu
}
/* Configure the system */
- if (set_status[SET_BASE] & SET_INSTALLED)
+ if (set_status[SET_BASE] & SET_INSTALLED) {
run_makedev();
+ if (!update) {
+ run_program(RUN_CHROOT|RUN_DISPLAY,
+ "/usr/sbin/certctl rehash");
+ }
+ }
if (!update) {
struct stat sb1, sb2;
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Sat Sep 9 14:50:15 UTC 2023 Modified Files: src/usr.sbin/sysinst [netbsd-10]: util.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #358): usr.sbin/sysinst/util.c: revision 1.73 sysinst(1): Run `certctl rehash' on fresh installs. It has come to my attention that sysinst does not, in fact, run postinstall(8) post-install -- only post-upgrade. Perhaps we should change this so that postinstall serves the purpose it says on the box -- make postinstall mandatory for new installations. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.71.2.1 src/usr.sbin/sysinst/util.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.sbin/sysinst/arch/luna68k
Module Name:src
Committed By: martin
Date: Mon Aug 21 11:05:54 UTC 2023
Modified Files:
src/usr.sbin/sysinst/arch/luna68k [netbsd-10]: md.c md.h
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #331):
usr.sbin/sysinst/arch/luna68k/md.c: revision 1.11
usr.sbin/sysinst/arch/luna68k/md.h: revision 1.7
PR 55058: force the boot partition to sd0d, so our root partitions becomes
sd0a again.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.2.1 src/usr.sbin/sysinst/arch/luna68k/md.c
cvs rdiff -u -r1.6 -r1.6.2.1 src/usr.sbin/sysinst/arch/luna68k/md.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/arch/luna68k/md.c
diff -u src/usr.sbin/sysinst/arch/luna68k/md.c:1.10 src/usr.sbin/sysinst/arch/luna68k/md.c:1.10.2.1
--- src/usr.sbin/sysinst/arch/luna68k/md.c:1.10 Sat Jan 29 16:01:19 2022
+++ src/usr.sbin/sysinst/arch/luna68k/md.c Mon Aug 21 11:05:54 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.10 2022/01/29 16:01:19 martin Exp $ */
+/* $NetBSD: md.c,v 1.10.2.1 2023/08/21 11:05:54 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -117,6 +117,23 @@ md_make_bsd_partitions(struct install_pa
return make_bsd_partitions(install);
}
+static part_id
+find_boot_part(struct install_partition_desc *install)
+{
+ for (size_t i = 0; i < install->num; i++) {
+ if (install->infos[i].fs_type != PART_BOOT_TYPE)
+ continue;
+ if (install->infos[i].fs_version != PART_BOOT_SUBT)
+ continue;
+ if (install->infos[i].size < (PART_BOOT/512))
+ continue;
+ if (install->infos[i].cur_start > 0)
+ continue;
+ return i;
+ }
+ return NO_PART;
+}
+
/*
* any additional partition validation
*/
@@ -128,14 +145,12 @@ md_check_partitions(struct install_parti
* Make sure that a boot partition (old 4.3BSD UFS) is prepared
* properly for our native bootloader.
*/
- if (install->num < 1 || install->infos[0].fs_type != PART_BOOT_TYPE ||
- install->infos[0].fs_version != PART_BOOT_SUBT ||
- !(install->infos[0].instflags & PUIINST_NEWFS)) {
- msg_display(MSG_nobootpartdisklabel);
- process_menu(MENU_ok, NULL);
- return false;
- }
- return true;
+ if (find_boot_part(install) != NO_PART)
+ return true;
+
+ msg_display(MSG_nobootpartdisklabel);
+ process_menu(MENU_ok, NULL);
+ return false;
}
/*
@@ -187,16 +202,19 @@ int
md_post_newfs(struct install_partition_desc *install)
{
char rdisk[STRSIZE], disk[STRSIZE];
+ part_id boot_part = find_boot_part(install);
- if (install->num < 1)
+ if (boot_part == NO_PART)
return 1;
- if (!install->infos[0].parts->pscheme->get_part_device(
- install->infos[0].parts, install->infos[0].cur_part_id,
+ if (!install->infos[boot_part].parts->pscheme->get_part_device(
+ install->infos[boot_part].parts,
+ install->infos[boot_part].cur_part_id,
rdisk, sizeof rdisk, NULL, raw_dev_name, true, true))
return 1;
- if (!install->infos[0].parts->pscheme->get_part_device(
- install->infos[0].parts, install->infos[0].cur_part_id,
+ if (!install->infos[boot_part].parts->pscheme->get_part_device(
+ install->infos[boot_part].parts,
+ install->infos[boot_part].cur_part_id,
disk, sizeof disk, NULL, plain_name, true, true))
return 1;
@@ -240,12 +258,14 @@ md_update(struct install_partition_desc
struct stat sb;
bool hasboot = false;
char disk[STRSIZE];
+ part_id boot_part = find_boot_part(install);
- if (install->num < 1)
+ if (boot_part == NO_PART)
return 0;
- if (!install->infos[0].parts->pscheme->get_part_device(
- install->infos[0].parts, install->infos[0].cur_part_id,
+ if (!install->infos[boot_part].parts->pscheme->get_part_device(
+ install->infos[boot_part].parts,
+ install->infos[boot_part].cur_part_id,
disk, sizeof disk, NULL, plain_name, true, true))
return 0;
@@ -288,4 +308,3 @@ md_gpt_post_write(struct disk_partitions
return true;
}
#endif
-
Index: src/usr.sbin/sysinst/arch/luna68k/md.h
diff -u src/usr.sbin/sysinst/arch/luna68k/md.h:1.6 src/usr.sbin/sysinst/arch/luna68k/md.h:1.6.2.1
--- src/usr.sbin/sysinst/arch/luna68k/md.h:1.6 Fri Jun 17 16:09:47 2022
+++ src/usr.sbin/sysinst/arch/luna68k/md.h Mon Aug 21 11:05:54 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.6 2022/06/17 16:09:47 tsutsui Exp $ */
+/* $NetBSD: md.h,v 1.6.2.1 2023/08/21 11:05:54 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -64,3 +64,15 @@
* the hand-edited disklabel will NOT be written by MI code.
*/
#define DISKLABEL_CMD "disklabel -w -r"
+
+/*
+ * Our boot partition is FFSv1, so it will be reported as PT_root
+ * and might take up disklabel slot 0 (partition 'a'), which we would
+ * like to avoid and make it use 'd' instead.
+ * Only allow PT_root partitions for slots before RAW_PART if they
+ * start past the boot partition size.
+ */
+#define
CVS commit: [netbsd-10] src/usr.sbin/sysinst/arch/luna68k
Module Name:src Committed By: martin Date: Mon Aug 21 11:05:54 UTC 2023 Modified Files: src/usr.sbin/sysinst/arch/luna68k [netbsd-10]: md.c md.h Log Message: Pull up following revision(s) (requested by tsutsui in ticket #331): usr.sbin/sysinst/arch/luna68k/md.c: revision 1.11 usr.sbin/sysinst/arch/luna68k/md.h: revision 1.7 PR 55058: force the boot partition to sd0d, so our root partitions becomes sd0a again. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.10.2.1 src/usr.sbin/sysinst/arch/luna68k/md.c cvs rdiff -u -r1.6 -r1.6.2.1 src/usr.sbin/sysinst/arch/luna68k/md.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src
Committed By: msaitoh
Date: Fri Jun 23 05:40:02 UTC 2023
Modified Files:
src/usr.sbin/sysinst [netbsd-10]: main.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #212):
usr.sbin/sysinst/main.c: revision 1.31
If the install medium does not come with any openssl trusted root certs,
tell ftp(1) not to verify trust chains when doing https downloads.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.30.2.1 src/usr.sbin/sysinst/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/main.c
diff -u src/usr.sbin/sysinst/main.c:1.30 src/usr.sbin/sysinst/main.c:1.30.2.1
--- src/usr.sbin/sysinst/main.c:1.30 Sun Jul 10 10:52:40 2022
+++ src/usr.sbin/sysinst/main.c Fri Jun 23 05:40:02 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.30 2022/07/10 10:52:40 martin Exp $ */
+/* $NetBSD: main.c,v 1.30.2.1 2023/06/23 05:40:02 msaitoh Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -97,6 +97,7 @@ __dead static void miscsighandler(int);
static void ttysighandler(int);
static void cleanup(void);
static void process_f_flag(char *);
+static bool no_openssl_trust_anchors_available(void);
static int exit_cleanly = 0; /* Did we finish nicely? */
FILE *logfp; /* log file */
@@ -264,6 +265,10 @@ main(int argc, char **argv)
/* Initialize the partitioning subsystem */
partitions_init();
+ /* do we need to tell ftp(1) to avoid checking certificate chains? */
+ if (no_openssl_trust_anchors_available())
+ setenv("FTPSSLNOVERIFY", "1", 1);
+
/* initialize message window */
if (menu_init()) {
__menu_initerror();
@@ -635,3 +640,46 @@ process_f_flag(char *f_name)
fclose(fp);
}
+
+/*
+ * return true if we do not have any root certificates installed,
+ * so can not verify any trust chain.
+ * We rely on /etc/openssl being the OPENSSLDIR and test the
+ * "all in one" /etc/openssl/cert.pem first, if that is not found
+ * check if there are multiple regular files or symlinks in
+ * /etc/openssl/certs/.
+ */
+static bool
+no_openssl_trust_anchors_available(void)
+{
+ struct stat sb;
+ DIR *dir;
+ struct dirent *ent;
+ size_t cnt;
+
+ /* check the omnibus single file variant first */
+ if (stat("/etc/openssl/cert.pem", ) == 0 &&
+ S_ISREG(sb.st_mode) && sb.st_size > 0)
+ return false; /* exists and is a non-empty file */
+
+ /* look for files/symlinks in the certs subdirectory */
+ dir = opendir("/etc/openssl/certs");
+ if (dir == NULL)
+ return true;
+ for (cnt = 0; cnt < 2; ) {
+ ent = readdir(dir);
+ if (ent == NULL)
+ break;
+ switch (ent->d_type) {
+ case DT_REG:
+ case DT_LNK:
+ cnt++;
+ break;
+ default:
+ break;
+ }
+ }
+ closedir(dir);
+
+ return cnt < 2;
+}
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src Committed By: msaitoh Date: Fri Jun 23 05:40:02 UTC 2023 Modified Files: src/usr.sbin/sysinst [netbsd-10]: main.c Log Message: Pull up following revision(s) (requested by martin in ticket #212): usr.sbin/sysinst/main.c: revision 1.31 If the install medium does not come with any openssl trusted root certs, tell ftp(1) not to verify trust chains when doing https downloads. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.30.2.1 src/usr.sbin/sysinst/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src
Committed By: snj
Date: Wed Jan 4 05:30:44 UTC 2023
Modified Files:
src/usr.sbin/sysinst [netbsd-10]: net.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #35):
usr.sbin/sysinst/net.c: revision 1.44
Clear the msg area after prompting for the network device to use
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.43.2.1 src/usr.sbin/sysinst/net.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/net.c
diff -u src/usr.sbin/sysinst/net.c:1.43 src/usr.sbin/sysinst/net.c:1.43.2.1
--- src/usr.sbin/sysinst/net.c:1.43 Wed May 18 16:39:03 2022
+++ src/usr.sbin/sysinst/net.c Wed Jan 4 05:30:44 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: net.c,v 1.43 2022/05/18 16:39:03 martin Exp $ */
+/* $NetBSD: net.c,v 1.43.2.1 2023/01/04 05:30:44 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -594,6 +594,7 @@ again:
selected_net = -1;
msg_display(MSG_asknetdev);
process_menu(menu_no, _net);
+ msg_clear();
if (selected_net == -1) {
free_menu(menu_no);
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src Committed By: snj Date: Wed Jan 4 05:30:44 UTC 2023 Modified Files: src/usr.sbin/sysinst [netbsd-10]: net.c Log Message: Pull up following revision(s) (requested by martin in ticket #35): usr.sbin/sysinst/net.c: revision 1.44 Clear the msg area after prompting for the network device to use To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.43.2.1 src/usr.sbin/sysinst/net.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src
Committed By: snj
Date: Sat Dec 31 04:55:13 UTC 2022
Modified Files:
src/usr.sbin/sysinst [netbsd-10]: bsddisklabel.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #30):
usr.sbin/sysinst/bsddisklabel.c: revision 1.71
PR 57132: when calculation additional space available for the "expanded"
partition (typically /) do not forget the reserved space (that might
be required for the system/bootloader/other MD stuff).
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.69.2.1 src/usr.sbin/sysinst/bsddisklabel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/bsddisklabel.c
diff -u src/usr.sbin/sysinst/bsddisklabel.c:1.69 src/usr.sbin/sysinst/bsddisklabel.c:1.69.2.1
--- src/usr.sbin/sysinst/bsddisklabel.c:1.69 Thu Dec 15 15:32:04 2022
+++ src/usr.sbin/sysinst/bsddisklabel.c Sat Dec 31 04:55:12 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: bsddisklabel.c,v 1.69 2022/12/15 15:32:04 martin Exp $ */
+/* $NetBSD: bsddisklabel.c,v 1.69.2.1 2022/12/31 04:55:12 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1434,7 +1434,8 @@ apply_settings_to_partitions(struct disk
* but check size limits.
*/
if (exp_ndx < wanted->num) {
- daddr_t free_space = parts->free_space - planned_space;
+ daddr_t free_space = parts->free_space - planned_space -
+ wanted->reserved_space;
daddr_t new_size = wanted->infos[exp_ndx].size;
if (free_space > 0)
new_size += roundup(free_space,align);
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src Committed By: snj Date: Sat Dec 31 04:55:13 UTC 2022 Modified Files: src/usr.sbin/sysinst [netbsd-10]: bsddisklabel.c Log Message: Pull up following revision(s) (requested by martin in ticket #30): usr.sbin/sysinst/bsddisklabel.c: revision 1.71 PR 57132: when calculation additional space available for the "expanded" partition (typically /) do not forget the reserved space (that might be required for the system/bootloader/other MD stuff). To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.69.2.1 src/usr.sbin/sysinst/bsddisklabel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
