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/9570b519e5ba
branches:  netbsd-9
changeset: 359951:9570b519e5ba
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Feb 02 04:25:36 2022 +0000

description:
Pull up following revision(s) (requested by martin in ticket #1422):
        usr.sbin/sysinst/util.c: revision 1.64
        usr.sbin/sysinst/arch/hpcsh/md.c: revision 1.11
        usr.sbin/sysinst/arch/alpha/md.c: revision 1.10
        usr.sbin/sysinst/arch/sparc64/md.c: revision 1.7
        usr.sbin/sysinst/arch/emips/md.c: revision 1.10
        usr.sbin/sysinst/arch/cobalt/md.c: revision 1.15
        usr.sbin/sysinst/arch/x68k/md.c: revision 1.12
        usr.sbin/sysinst/arch/sandpoint/md.c: revision 1.10
        usr.sbin/sysinst/arch/luna68k/md.c: revision 1.10
        usr.sbin/sysinst/arch/hp300/md.c: revision 1.12
        usr.sbin/sysinst/arch/vax/md.c: revision 1.8
        usr.sbin/sysinst/arch/hpcmips/md.c: revision 1.10
        usr.sbin/sysinst/target.c: revision 1.16
        usr.sbin/sysinst/arch/mvme68k/md.c: revision 1.12
        usr.sbin/sysinst/arch/arc/md.c: revision 1.14
        usr.sbin/sysinst/target.c: revision 1.17
        usr.sbin/sysinst/arch/i386/md.c: revision 1.34
        usr.sbin/sysinst/arch/mac68k/md.c: revision 1.11
        usr.sbin/sysinst/arch/atari/md.c: revision 1.8
        usr.sbin/sysinst/arch/sgimips/md.c: revision 1.10
        usr.sbin/sysinst/arch/acorn32/md.c: revision 1.8
        usr.sbin/sysinst/install.c: revision 1.22
        usr.sbin/sysinst/arch/amiga/md.c: revision 1.7
        usr.sbin/sysinst/arch/cats/md.c: revision 1.6
        usr.sbin/sysinst/arch/dummy/md.c: revision 1.7
        usr.sbin/sysinst/arch/shark/md.c: revision 1.7
        usr.sbin/sysinst/arch/pmax/md.c: revision 1.9
        usr.sbin/sysinst/arch/newsmips/md.c: revision 1.7
        usr.sbin/sysinst/arch/mipsco/md.c: revision 1.9
        usr.sbin/sysinst/arch/landisk/md.c: revision 1.15
        usr.sbin/sysinst/arch/hppa/md.c: revision 1.9
        usr.sbin/sysinst/arch/prep/md.c: revision 1.14
        usr.sbin/sysinst/defs.h: revision 1.77
        usr.sbin/sysinst/arch/ofppc/md.c: revision 1.13
        usr.sbin/sysinst/arch/ews4800mips/md.c: revision 1.8
        usr.sbin/sysinst/defs.h: revision 1.78
        usr.sbin/sysinst/arch/macppc/md.c: revision 1.7
        usr.sbin/sysinst/arch/evbppc/md.c: revision 1.10
        usr.sbin/sysinst/defs.h: revision 1.79
        usr.sbin/sysinst/gpt.c: revision 1.27
        usr.sbin/sysinst/arch/bebox/md.c: revision 1.10
        usr.sbin/sysinst/gpt.c: revision 1.28
        usr.sbin/sysinst/arch/sparc/md.c: revision 1.7
        usr.sbin/sysinst/arch/evbsh3/md.c: revision 1.7
        usr.sbin/sysinst/arch/evbarm/md.c: revision 1.22
        usr.sbin/sysinst/arch/news68k/md.c: revision 1.8
        usr.sbin/sysinst/upgrade.c: revision 1.19
        usr.sbin/sysinst/arch/zaurus/md.c: revision 1.12
        usr.sbin/sysinst/arch/playstation2/md.c: revision 1.10
        usr.sbin/sysinst/arch/hpcarm/md.c: revision 1.11
        usr.sbin/sysinst/arch/evbmips/md.c: revision 1.10
        usr.sbin/sysinst/main.c: revision 1.28
Add an option to set the directory where we look for message catalogs.
Try to get rid of all wedges we created (after unmounting).
When upgrading, update the boot code post extraction from
the updated target file system.
Do not defer wedge deletions when we have nothing mounted.
Define and use a constant for maximum disk name length.

diffstat:

 usr.sbin/sysinst/arch/acorn32/md.c      |    4 +-
 usr.sbin/sysinst/arch/alpha/md.c        |    4 +-
 usr.sbin/sysinst/arch/amiga/md.c        |    4 +-
 usr.sbin/sysinst/arch/arc/md.c          |    4 +-
 usr.sbin/sysinst/arch/atari/md.c        |    4 +-
 usr.sbin/sysinst/arch/bebox/md.c        |    4 +-
 usr.sbin/sysinst/arch/cats/md.c         |    4 +-
 usr.sbin/sysinst/arch/cobalt/md.c       |    4 +-
 usr.sbin/sysinst/arch/dummy/md.c        |    4 +-
 usr.sbin/sysinst/arch/emips/md.c        |    4 +-
 usr.sbin/sysinst/arch/evbarm/md.c       |    4 +-
 usr.sbin/sysinst/arch/evbmips/md.c      |    4 +-
 usr.sbin/sysinst/arch/evbppc/md.c       |    4 +-
 usr.sbin/sysinst/arch/evbsh3/md.c       |    4 +-
 usr.sbin/sysinst/arch/ews4800mips/md.c  |    4 +-
 usr.sbin/sysinst/arch/hp300/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/hppa/md.c         |    4 +-
 usr.sbin/sysinst/arch/i386/md.c         |   87 ++++++++++++++++---
 usr.sbin/sysinst/arch/landisk/md.c      |    4 +-
 usr.sbin/sysinst/arch/luna68k/md.c      |    4 +-
 usr.sbin/sysinst/arch/mac68k/md.c       |    4 +-
 usr.sbin/sysinst/arch/macppc/md.c       |    4 +-
 usr.sbin/sysinst/arch/mipsco/md.c       |    4 +-
 usr.sbin/sysinst/arch/mvme68k/md.c      |    4 +-
 usr.sbin/sysinst/arch/news68k/md.c      |    4 +-
 usr.sbin/sysinst/arch/newsmips/md.c     |    4 +-
 usr.sbin/sysinst/arch/ofppc/md.c        |    4 +-
 usr.sbin/sysinst/arch/playstation2/md.c |    4 +-
 usr.sbin/sysinst/arch/pmax/md.c         |    4 +-
 usr.sbin/sysinst/arch/prep/md.c         |    4 +-
 usr.sbin/sysinst/arch/sandpoint/md.c    |    4 +-
 usr.sbin/sysinst/arch/sgimips/md.c      |    4 +-
 usr.sbin/sysinst/arch/shark/md.c        |    4 +-
 usr.sbin/sysinst/arch/sparc/md.c        |    4 +-
 usr.sbin/sysinst/arch/sparc64/md.c      |    4 +-
 usr.sbin/sysinst/arch/vax/md.c          |    4 +-
 usr.sbin/sysinst/arch/x68k/md.c         |    4 +-
 usr.sbin/sysinst/arch/zaurus/md.c       |    4 +-
 usr.sbin/sysinst/defs.h                 |    6 +-
 usr.sbin/sysinst/gpt.c                  |    7 +-
 usr.sbin/sysinst/install.c              |    4 +-
 usr.sbin/sysinst/main.c                 |  140 ++++++++++++++++++-------------
 usr.sbin/sysinst/target.c               |   55 +++++++++++-
 usr.sbin/sysinst/upgrade.c              |    4 +-
 usr.sbin/sysinst/util.c                 |   20 ++++-
 48 files changed, 319 insertions(+), 164 deletions(-)

diffs (truncated from 1389 to 300 lines):

diff -r 11caa63f5a88 -r 9570b519e5ba usr.sbin/sysinst/arch/acorn32/md.c
--- a/usr.sbin/sysinst/arch/acorn32/md.c        Tue Feb 01 11:42:18 2022 +0000
+++ b/usr.sbin/sysinst/arch/acorn32/md.c        Wed Feb 02 04:25:36 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.5.2.1 2020/10/15 19:36:51 bouyer Exp $ */
+/*     $NetBSD: md.c,v 1.5.2.2 2022/02/02 04:25:38 msaitoh Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -249,7 +249,7 @@
 }
 
 int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
 {
        return 0;
 }
diff -r 11caa63f5a88 -r 9570b519e5ba usr.sbin/sysinst/arch/alpha/md.c
--- a/usr.sbin/sysinst/arch/alpha/md.c  Tue Feb 01 11:42:18 2022 +0000
+++ b/usr.sbin/sysinst/arch/alpha/md.c  Wed Feb 02 04:25:36 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.6.2.3 2020/10/15 19:36:54 bouyer Exp $ */
+/*     $NetBSD: md.c,v 1.6.2.4 2022/02/02 04:25:36 msaitoh Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -175,7 +175,7 @@
 }
 
 int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
 {
        return 0;
 }
diff -r 11caa63f5a88 -r 9570b519e5ba usr.sbin/sysinst/arch/amiga/md.c
--- a/usr.sbin/sysinst/arch/amiga/md.c  Tue Feb 01 11:42:18 2022 +0000
+++ b/usr.sbin/sysinst/arch/amiga/md.c  Wed Feb 02 04:25:36 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.5.2.1 2020/10/15 19:36:54 bouyer Exp $ */
+/*     $NetBSD: md.c,v 1.5.2.2 2022/02/02 04:25:38 msaitoh Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -115,7 +115,7 @@
 }
 
 int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
 {
        return 0;
 }
diff -r 11caa63f5a88 -r 9570b519e5ba usr.sbin/sysinst/arch/arc/md.c
--- a/usr.sbin/sysinst/arch/arc/md.c    Tue Feb 01 11:42:18 2022 +0000
+++ b/usr.sbin/sysinst/arch/arc/md.c    Wed Feb 02 04:25:36 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.8.2.4 2020/10/15 19:36:51 bouyer Exp $ */
+/*     $NetBSD: md.c,v 1.8.2.5 2022/02/02 04:25:37 msaitoh Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -188,7 +188,7 @@
 }
 
 int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
 {
        return 0;
 }
diff -r 11caa63f5a88 -r 9570b519e5ba usr.sbin/sysinst/arch/atari/md.c
--- a/usr.sbin/sysinst/arch/atari/md.c  Tue Feb 01 11:42:18 2022 +0000
+++ b/usr.sbin/sysinst/arch/atari/md.c  Wed Feb 02 04:25:36 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.6.2.1 2020/10/15 19:36:55 bouyer Exp $ */
+/*     $NetBSD: md.c,v 1.6.2.2 2022/02/02 04:25:38 msaitoh Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -144,7 +144,7 @@
 }
 
 int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
 {
        return 0;
 }
diff -r 11caa63f5a88 -r 9570b519e5ba usr.sbin/sysinst/arch/bebox/md.c
--- a/usr.sbin/sysinst/arch/bebox/md.c  Tue Feb 01 11:42:18 2022 +0000
+++ b/usr.sbin/sysinst/arch/bebox/md.c  Wed Feb 02 04:25:36 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.5.2.3 2020/10/15 19:36:55 bouyer Exp $ */
+/*     $NetBSD: md.c,v 1.5.2.4 2022/02/02 04:25:40 msaitoh Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -160,7 +160,7 @@
 }
 
 int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
 {
        return 0;
 }
diff -r 11caa63f5a88 -r 9570b519e5ba usr.sbin/sysinst/arch/cats/md.c
--- a/usr.sbin/sysinst/arch/cats/md.c   Tue Feb 01 11:42:18 2022 +0000
+++ b/usr.sbin/sysinst/arch/cats/md.c   Wed Feb 02 04:25:36 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.4.2.1 2020/10/15 19:36:54 bouyer Exp $ */
+/*     $NetBSD: md.c,v 1.4.2.2 2022/02/02 04:25:38 msaitoh Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -170,7 +170,7 @@
 }
 
 int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
 {
        return 0;
 }
diff -r 11caa63f5a88 -r 9570b519e5ba usr.sbin/sysinst/arch/cobalt/md.c
--- a/usr.sbin/sysinst/arch/cobalt/md.c Tue Feb 01 11:42:18 2022 +0000
+++ b/usr.sbin/sysinst/arch/cobalt/md.c Wed Feb 02 04:25:36 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.8.2.4 2020/10/15 19:36:51 bouyer Exp $ */
+/*     $NetBSD: md.c,v 1.8.2.5 2022/02/02 04:25:36 msaitoh Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -205,7 +205,7 @@
 }
 
 int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
 {
        return 0;
 }
diff -r 11caa63f5a88 -r 9570b519e5ba usr.sbin/sysinst/arch/dummy/md.c
--- a/usr.sbin/sysinst/arch/dummy/md.c  Tue Feb 01 11:42:18 2022 +0000
+++ b/usr.sbin/sysinst/arch/dummy/md.c  Wed Feb 02 04:25:36 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.5.2.1 2020/10/15 19:36:51 bouyer Exp $        */
+/*     $NetBSD: md.c,v 1.5.2.2 2022/02/02 04:25:38 msaitoh Exp $       */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -94,7 +94,7 @@
 }
 
 int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
 {
        return 0;
 }
diff -r 11caa63f5a88 -r 9570b519e5ba usr.sbin/sysinst/arch/emips/md.c
--- a/usr.sbin/sysinst/arch/emips/md.c  Tue Feb 01 11:42:18 2022 +0000
+++ b/usr.sbin/sysinst/arch/emips/md.c  Wed Feb 02 04:25:36 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.7.2.2 2020/10/15 19:36:55 bouyer Exp $        */
+/*     $NetBSD: md.c,v 1.7.2.3 2022/02/02 04:25:36 msaitoh Exp $       */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -162,7 +162,7 @@
  * On emips, we take this opportunity to update the boot loader.
  */
 int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
 {
        char ldr_path[STRSIZE];
 
diff -r 11caa63f5a88 -r 9570b519e5ba usr.sbin/sysinst/arch/evbarm/md.c
--- a/usr.sbin/sysinst/arch/evbarm/md.c Tue Feb 01 11:42:18 2022 +0000
+++ b/usr.sbin/sysinst/arch/evbarm/md.c Wed Feb 02 04:25:36 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.8.2.7 2021/05/12 06:53:55 msaitoh Exp $ */
+/*     $NetBSD: md.c,v 1.8.2.8 2022/02/02 04:25:40 msaitoh Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -270,7 +270,7 @@
 }
 
 int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
 {
 
        return 0;
diff -r 11caa63f5a88 -r 9570b519e5ba usr.sbin/sysinst/arch/evbmips/md.c
--- a/usr.sbin/sysinst/arch/evbmips/md.c        Tue Feb 01 11:42:18 2022 +0000
+++ b/usr.sbin/sysinst/arch/evbmips/md.c        Wed Feb 02 04:25:36 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.5.2.3 2020/10/15 19:36:53 bouyer Exp $ */
+/* $NetBSD: md.c,v 1.5.2.4 2022/02/02 04:25:40 msaitoh Exp $ */
 
 /*
  * Copyright 1997,2002 Piermont Information Systems Inc.
@@ -160,7 +160,7 @@
 }
 
 int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
 {
        return 0;
 }
diff -r 11caa63f5a88 -r 9570b519e5ba usr.sbin/sysinst/arch/evbppc/md.c
--- a/usr.sbin/sysinst/arch/evbppc/md.c Tue Feb 01 11:42:18 2022 +0000
+++ b/usr.sbin/sysinst/arch/evbppc/md.c Wed Feb 02 04:25:36 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.5.2.3 2020/10/15 19:36:53 bouyer Exp $ */
+/*     $NetBSD: md.c,v 1.5.2.4 2022/02/02 04:25:39 msaitoh Exp $ */
 
 /*
  * Copyright 1997,2002 Piermont Information Systems Inc.
@@ -161,7 +161,7 @@
 }
 
 int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
 {
        return 0;
 }
diff -r 11caa63f5a88 -r 9570b519e5ba usr.sbin/sysinst/arch/evbsh3/md.c
--- a/usr.sbin/sysinst/arch/evbsh3/md.c Tue Feb 01 11:42:18 2022 +0000
+++ b/usr.sbin/sysinst/arch/evbsh3/md.c Wed Feb 02 04:25:36 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.5.2.1 2020/10/15 19:36:52 bouyer Exp $        */
+/*     $NetBSD: md.c,v 1.5.2.2 2022/02/02 04:25:40 msaitoh Exp $       */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -182,7 +182,7 @@
 }
 
 int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
 {
        return 0;
 }
diff -r 11caa63f5a88 -r 9570b519e5ba usr.sbin/sysinst/arch/ews4800mips/md.c
--- a/usr.sbin/sysinst/arch/ews4800mips/md.c    Tue Feb 01 11:42:18 2022 +0000
+++ b/usr.sbin/sysinst/arch/ews4800mips/md.c    Wed Feb 02 04:25:36 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.4.2.2 2020/10/15 19:36:55 bouyer Exp $        */
+/*     $NetBSD: md.c,v 1.4.2.3 2022/02/02 04:25:39 msaitoh Exp $       */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -183,7 +183,7 @@
 }
 
 int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
 {
        return 0;
 }
diff -r 11caa63f5a88 -r 9570b519e5ba usr.sbin/sysinst/arch/hp300/md.c
--- a/usr.sbin/sysinst/arch/hp300/md.c  Tue Feb 01 11:42:18 2022 +0000
+++ b/usr.sbin/sysinst/arch/hp300/md.c  Wed Feb 02 04:25:36 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.8.2.3 2020/10/15 19:36:51 bouyer Exp $ */
+/*     $NetBSD: md.c,v 1.8.2.4 2022/02/02 04:25:37 msaitoh Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -203,7 +203,7 @@
 }
 
 int
-md_post_extract(struct install_partition_desc *install)
+md_post_extract(struct install_partition_desc *install, bool upgrade)
 {
        return 0;
 }
diff -r 11caa63f5a88 -r 9570b519e5ba usr.sbin/sysinst/arch/hpcarm/md.c
--- a/usr.sbin/sysinst/arch/hpcarm/md.c Tue Feb 01 11:42:18 2022 +0000
+++ b/usr.sbin/sysinst/arch/hpcarm/md.c Wed Feb 02 04:25:36 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.5.2.3 2020/10/15 19:36:54 bouyer Exp $ */
+/*     $NetBSD: md.c,v 1.5.2.4 2022/02/02 04:25:40 msaitoh Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -230,7 +230,7 @@
 }
 



Home | Main Index | Thread Index | Old Index