Module Name: src
Committed By: msaitoh
Date: Sun Aug 18 13:19:53 UTC 2019
Modified Files:
src/usr.sbin/sysinst/arch/arc [netbsd-9]: md.c
src/usr.sbin/sysinst/arch/bebox [netbsd-9]: md.c
src/usr.sbin/sysinst/arch/cobalt [netbsd-9]: md.c
src/usr.sbin/sysinst/arch/evbarm [netbsd-9]: md.c
src/usr.sbin/sysinst/arch/evbmips [netbsd-9]: md.c
src/usr.sbin/sysinst/arch/evbppc [netbsd-9]: md.c
src/usr.sbin/sysinst/arch/hpcarm [netbsd-9]: md.c
src/usr.sbin/sysinst/arch/hpcmips [netbsd-9]: md.c
src/usr.sbin/sysinst/arch/hpcsh [netbsd-9]: md.c
src/usr.sbin/sysinst/arch/i386 [netbsd-9]: md.c
src/usr.sbin/sysinst/arch/landisk [netbsd-9]: md.c
src/usr.sbin/sysinst/arch/ofppc [netbsd-9]: md.c
src/usr.sbin/sysinst/arch/playstation2 [netbsd-9]: md.c
src/usr.sbin/sysinst/arch/prep [netbsd-9]: md.c
src/usr.sbin/sysinst/arch/sandpoint [netbsd-9]: md.c
src/usr.sbin/sysinst/arch/zaurus [netbsd-9]: md.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #77):
usr.sbin/sysinst/arch/sandpoint/md.c: revision 1.6
usr.sbin/sysinst/arch/playstation2/md.c: revision 1.6
usr.sbin/sysinst/arch/evbppc/md.c: revision 1.6
usr.sbin/sysinst/arch/hpcarm/md.c: revision 1.6
usr.sbin/sysinst/arch/zaurus/md.c: revision 1.6
usr.sbin/sysinst/arch/arc/md.c: revision 1.9
usr.sbin/sysinst/arch/hpcmips/md.c: revision 1.6
usr.sbin/sysinst/arch/bebox/md.c: revision 1.6
usr.sbin/sysinst/arch/hpcsh/md.c: revision 1.7
usr.sbin/sysinst/arch/landisk/md.c: revision 1.11
usr.sbin/sysinst/arch/prep/md.c: revision 1.9
usr.sbin/sysinst/arch/i386/md.c: revision 1.21
usr.sbin/sysinst/arch/evbmips/md.c: revision 1.6
usr.sbin/sysinst/arch/evbarm/md.c: revision 1.9
usr.sbin/sysinst/arch/cobalt/md.c: revision 1.9
usr.sbin/sysinst/arch/ofppc/md.c: revision 1.8
When we ask the user to select a partitioning scheme and they refuse
(that is: select "Exit" in the menu), abort installation.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.2.1 src/usr.sbin/sysinst/arch/arc/md.c
cvs rdiff -u -r1.5 -r1.5.2.1 src/usr.sbin/sysinst/arch/bebox/md.c
cvs rdiff -u -r1.8 -r1.8.2.1 src/usr.sbin/sysinst/arch/cobalt/md.c
cvs rdiff -u -r1.8 -r1.8.2.1 src/usr.sbin/sysinst/arch/evbarm/md.c
cvs rdiff -u -r1.5 -r1.5.2.1 src/usr.sbin/sysinst/arch/evbmips/md.c
cvs rdiff -u -r1.5 -r1.5.2.1 src/usr.sbin/sysinst/arch/evbppc/md.c
cvs rdiff -u -r1.5 -r1.5.2.1 src/usr.sbin/sysinst/arch/hpcarm/md.c
cvs rdiff -u -r1.5 -r1.5.2.1 src/usr.sbin/sysinst/arch/hpcmips/md.c
cvs rdiff -u -r1.6 -r1.6.2.1 src/usr.sbin/sysinst/arch/hpcsh/md.c
cvs rdiff -u -r1.20 -r1.20.2.1 src/usr.sbin/sysinst/arch/i386/md.c
cvs rdiff -u -r1.10 -r1.10.2.1 src/usr.sbin/sysinst/arch/landisk/md.c
cvs rdiff -u -r1.7 -r1.7.2.1 src/usr.sbin/sysinst/arch/ofppc/md.c
cvs rdiff -u -r1.5 -r1.5.2.1 src/usr.sbin/sysinst/arch/playstation2/md.c
cvs rdiff -u -r1.8 -r1.8.2.1 src/usr.sbin/sysinst/arch/prep/md.c
cvs rdiff -u -r1.5 -r1.5.2.1 src/usr.sbin/sysinst/arch/sandpoint/md.c
cvs rdiff -u -r1.5 -r1.5.2.1 src/usr.sbin/sysinst/arch/zaurus/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/arc/md.c
diff -u src/usr.sbin/sysinst/arch/arc/md.c:1.8 src/usr.sbin/sysinst/arch/arc/md.c:1.8.2.1
--- src/usr.sbin/sysinst/arch/arc/md.c:1.8 Sat Jul 13 17:13:36 2019
+++ src/usr.sbin/sysinst/arch/arc/md.c Sun Aug 18 13:19:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.8 2019/07/13 17:13:36 martin Exp $ */
+/* $NetBSD: md.c,v 1.8.2.1 2019/08/18 13:19:51 msaitoh Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -75,7 +75,7 @@ md_get_info(struct install_partition_des
select_part_scheme(pm, NULL, true, NULL);
if (!ps)
- return true;
+ return false;
struct disk_partitions *parts =
(*ps->create_new_for_disk)(pm->diskdev,
Index: src/usr.sbin/sysinst/arch/bebox/md.c
diff -u src/usr.sbin/sysinst/arch/bebox/md.c:1.5 src/usr.sbin/sysinst/arch/bebox/md.c:1.5.2.1
--- src/usr.sbin/sysinst/arch/bebox/md.c:1.5 Sat Jul 13 17:13:36 2019
+++ src/usr.sbin/sysinst/arch/bebox/md.c Sun Aug 18 13:19:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.5 2019/07/13 17:13:36 martin Exp $ */
+/* $NetBSD: md.c,v 1.5.2.1 2019/08/18 13:19:52 msaitoh Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -68,7 +68,7 @@ md_get_info(struct install_partition_des
select_part_scheme(pm, NULL, true, NULL);
if (!ps)
- return true;
+ return false;
struct disk_partitions *parts =
(*ps->create_new_for_disk)(pm->diskdev,
Index: src/usr.sbin/sysinst/arch/cobalt/md.c
diff -u src/usr.sbin/sysinst/arch/cobalt/md.c:1.8 src/usr.sbin/sysinst/arch/cobalt/md.c:1.8.2.1
--- src/usr.sbin/sysinst/arch/cobalt/md.c:1.8 Sat Jul 13 17:13:36 2019
+++ src/usr.sbin/sysinst/arch/cobalt/md.c Sun Aug 18 13:19:53 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.8 2019/07/13 17:13:36 martin Exp $ */
+/* $NetBSD: md.c,v 1.8.2.1 2019/08/18 13:19:53 msaitoh Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -75,7 +75,7 @@ md_get_info(struct install_partition_des
select_part_scheme(pm, NULL, true, NULL);
if (!ps)
- return true;
+ return false;
struct disk_partitions *parts =
(*ps->create_new_for_disk)(pm->diskdev,
Index: src/usr.sbin/sysinst/arch/evbarm/md.c
diff -u src/usr.sbin/sysinst/arch/evbarm/md.c:1.8 src/usr.sbin/sysinst/arch/evbarm/md.c:1.8.2.1
--- src/usr.sbin/sysinst/arch/evbarm/md.c:1.8 Sat Jul 13 17:13:37 2019
+++ src/usr.sbin/sysinst/arch/evbarm/md.c Sun Aug 18 13:19:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.8 2019/07/13 17:13:37 martin Exp $ */
+/* $NetBSD: md.c,v 1.8.2.1 2019/08/18 13:19:52 msaitoh Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -82,7 +82,7 @@ md_get_info(struct install_partition_des
select_part_scheme(pm, NULL, true, NULL);
if (!ps)
- return true;
+ return false;
struct disk_partitions *parts =
(*ps->create_new_for_disk)(pm->diskdev,
Index: src/usr.sbin/sysinst/arch/evbmips/md.c
diff -u src/usr.sbin/sysinst/arch/evbmips/md.c:1.5 src/usr.sbin/sysinst/arch/evbmips/md.c:1.5.2.1
--- src/usr.sbin/sysinst/arch/evbmips/md.c:1.5 Sat Jul 13 17:13:37 2019
+++ src/usr.sbin/sysinst/arch/evbmips/md.c Sun Aug 18 13:19:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.5 2019/07/13 17:13:37 martin Exp $ */
+/* $NetBSD: md.c,v 1.5.2.1 2019/08/18 13:19:52 msaitoh Exp $ */
/*
* Copyright 1997,2002 Piermont Information Systems Inc.
@@ -68,7 +68,7 @@ md_get_info(struct install_partition_des
select_part_scheme(pm, NULL, true, NULL);
if (!ps)
- return true;
+ return false;
struct disk_partitions *parts =
(*ps->create_new_for_disk)(pm->diskdev,
Index: src/usr.sbin/sysinst/arch/evbppc/md.c
diff -u src/usr.sbin/sysinst/arch/evbppc/md.c:1.5 src/usr.sbin/sysinst/arch/evbppc/md.c:1.5.2.1
--- src/usr.sbin/sysinst/arch/evbppc/md.c:1.5 Sat Jul 13 17:13:37 2019
+++ src/usr.sbin/sysinst/arch/evbppc/md.c Sun Aug 18 13:19:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.5 2019/07/13 17:13:37 martin Exp $ */
+/* $NetBSD: md.c,v 1.5.2.1 2019/08/18 13:19:51 msaitoh Exp $ */
/*
* Copyright 1997,2002 Piermont Information Systems Inc.
@@ -68,7 +68,7 @@ md_get_info(struct install_partition_des
select_part_scheme(pm, NULL, true, NULL);
if (!ps)
- return true;
+ return false;
struct disk_partitions *parts =
(*ps->create_new_for_disk)(pm->diskdev,
Index: src/usr.sbin/sysinst/arch/hpcarm/md.c
diff -u src/usr.sbin/sysinst/arch/hpcarm/md.c:1.5 src/usr.sbin/sysinst/arch/hpcarm/md.c:1.5.2.1
--- src/usr.sbin/sysinst/arch/hpcarm/md.c:1.5 Sat Jul 13 17:13:38 2019
+++ src/usr.sbin/sysinst/arch/hpcarm/md.c Sun Aug 18 13:19:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.5 2019/07/13 17:13:38 martin Exp $ */
+/* $NetBSD: md.c,v 1.5.2.1 2019/08/18 13:19:51 msaitoh Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -97,7 +97,7 @@ md_get_info(struct install_partition_des
select_part_scheme(pm, NULL, true, NULL);
if (!ps)
- return true;
+ return false;
struct disk_partitions *parts =
(*ps->create_new_for_disk)(pm->diskdev,
Index: src/usr.sbin/sysinst/arch/hpcmips/md.c
diff -u src/usr.sbin/sysinst/arch/hpcmips/md.c:1.5 src/usr.sbin/sysinst/arch/hpcmips/md.c:1.5.2.1
--- src/usr.sbin/sysinst/arch/hpcmips/md.c:1.5 Sat Jul 13 17:13:38 2019
+++ src/usr.sbin/sysinst/arch/hpcmips/md.c Sun Aug 18 13:19:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.5 2019/07/13 17:13:38 martin Exp $ */
+/* $NetBSD: md.c,v 1.5.2.1 2019/08/18 13:19:52 msaitoh Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -71,7 +71,7 @@ md_get_info(struct install_partition_des
select_part_scheme(pm, NULL, true, NULL);
if (!ps)
- return true;
+ return false;
struct disk_partitions *parts =
(*ps->create_new_for_disk)(pm->diskdev,
Index: src/usr.sbin/sysinst/arch/hpcsh/md.c
diff -u src/usr.sbin/sysinst/arch/hpcsh/md.c:1.6 src/usr.sbin/sysinst/arch/hpcsh/md.c:1.6.2.1
--- src/usr.sbin/sysinst/arch/hpcsh/md.c:1.6 Sat Jul 13 17:13:38 2019
+++ src/usr.sbin/sysinst/arch/hpcsh/md.c Sun Aug 18 13:19:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.6 2019/07/13 17:13:38 martin Exp $ */
+/* $NetBSD: md.c,v 1.6.2.1 2019/08/18 13:19:52 msaitoh Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -72,7 +72,7 @@ md_get_info(struct install_partition_des
select_part_scheme(pm, NULL, true, NULL);
if (!ps)
- return true;
+ return false;
struct disk_partitions *parts =
(*ps->create_new_for_disk)(pm->diskdev,
Index: src/usr.sbin/sysinst/arch/i386/md.c
diff -u src/usr.sbin/sysinst/arch/i386/md.c:1.20 src/usr.sbin/sysinst/arch/i386/md.c:1.20.2.1
--- src/usr.sbin/sysinst/arch/i386/md.c:1.20 Sun Jul 14 11:27:33 2019
+++ src/usr.sbin/sysinst/arch/i386/md.c Sun Aug 18 13:19:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.20 2019/07/14 11:27:33 martin Exp $ */
+/* $NetBSD: md.c,v 1.20.2.1 2019/08/18 13:19:52 msaitoh Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -118,7 +118,7 @@ md_get_info(struct install_partition_des
select_part_scheme(pm, NULL, true, NULL);
if (!ps)
- return true;
+ return false;
struct disk_partitions *parts =
(*ps->create_new_for_disk)(pm->diskdev,
Index: src/usr.sbin/sysinst/arch/landisk/md.c
diff -u src/usr.sbin/sysinst/arch/landisk/md.c:1.10 src/usr.sbin/sysinst/arch/landisk/md.c:1.10.2.1
--- src/usr.sbin/sysinst/arch/landisk/md.c:1.10 Sat Jul 13 17:13:38 2019
+++ src/usr.sbin/sysinst/arch/landisk/md.c Sun Aug 18 13:19:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.10 2019/07/13 17:13:38 martin Exp $ */
+/* $NetBSD: md.c,v 1.10.2.1 2019/08/18 13:19:52 msaitoh Exp $ */
/*
* Copyright 1997,2002 Piermont Information Systems Inc.
@@ -68,7 +68,7 @@ md_get_info(struct install_partition_des
select_part_scheme(pm, NULL, true, NULL);
if (!ps)
- return true;
+ return false;
struct disk_partitions *parts =
(*ps->create_new_for_disk)(pm->diskdev,
Index: src/usr.sbin/sysinst/arch/ofppc/md.c
diff -u src/usr.sbin/sysinst/arch/ofppc/md.c:1.7 src/usr.sbin/sysinst/arch/ofppc/md.c:1.7.2.1
--- src/usr.sbin/sysinst/arch/ofppc/md.c:1.7 Sat Jul 13 17:13:39 2019
+++ src/usr.sbin/sysinst/arch/ofppc/md.c Sun Aug 18 13:19:53 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.7 2019/07/13 17:13:39 martin Exp $ */
+/* $NetBSD: md.c,v 1.7.2.1 2019/08/18 13:19:53 msaitoh Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -89,7 +89,7 @@ md_get_info(struct install_partition_des
select_part_scheme(pm, NULL, true, NULL);
if (!ps)
- return true;
+ return false;
struct disk_partitions *parts =
(*ps->create_new_for_disk)(pm->diskdev,
Index: src/usr.sbin/sysinst/arch/playstation2/md.c
diff -u src/usr.sbin/sysinst/arch/playstation2/md.c:1.5 src/usr.sbin/sysinst/arch/playstation2/md.c:1.5.2.1
--- src/usr.sbin/sysinst/arch/playstation2/md.c:1.5 Sat Jul 13 17:13:39 2019
+++ src/usr.sbin/sysinst/arch/playstation2/md.c Sun Aug 18 13:19:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.5 2019/07/13 17:13:39 martin Exp $ */
+/* $NetBSD: md.c,v 1.5.2.1 2019/08/18 13:19:51 msaitoh Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -73,7 +73,7 @@ md_get_info(struct install_partition_des
select_part_scheme(pm, NULL, true, NULL);
if (!ps)
- return true;
+ return false;
struct disk_partitions *parts =
(*ps->create_new_for_disk)(pm->diskdev,
Index: src/usr.sbin/sysinst/arch/prep/md.c
diff -u src/usr.sbin/sysinst/arch/prep/md.c:1.8 src/usr.sbin/sysinst/arch/prep/md.c:1.8.2.1
--- src/usr.sbin/sysinst/arch/prep/md.c:1.8 Sat Jul 13 17:13:39 2019
+++ src/usr.sbin/sysinst/arch/prep/md.c Sun Aug 18 13:19:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.8 2019/07/13 17:13:39 martin Exp $ */
+/* $NetBSD: md.c,v 1.8.2.1 2019/08/18 13:19:52 msaitoh Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -73,7 +73,7 @@ md_get_info(struct install_partition_des
select_part_scheme(pm, NULL, true, NULL);
if (!ps)
- return true;
+ return false;
struct disk_partitions *parts =
(*ps->create_new_for_disk)(pm->diskdev,
Index: src/usr.sbin/sysinst/arch/sandpoint/md.c
diff -u src/usr.sbin/sysinst/arch/sandpoint/md.c:1.5 src/usr.sbin/sysinst/arch/sandpoint/md.c:1.5.2.1
--- src/usr.sbin/sysinst/arch/sandpoint/md.c:1.5 Sat Jul 13 17:13:39 2019
+++ src/usr.sbin/sysinst/arch/sandpoint/md.c Sun Aug 18 13:19:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.5 2019/07/13 17:13:39 martin Exp $ */
+/* $NetBSD: md.c,v 1.5.2.1 2019/08/18 13:19:51 msaitoh Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -102,7 +102,7 @@ md_get_info(struct install_partition_des
select_part_scheme(pm, NULL, true, NULL);
if (!ps)
- return true;
+ return false;
struct disk_partitions *parts =
(*ps->create_new_for_disk)(pm->diskdev,
Index: src/usr.sbin/sysinst/arch/zaurus/md.c
diff -u src/usr.sbin/sysinst/arch/zaurus/md.c:1.5 src/usr.sbin/sysinst/arch/zaurus/md.c:1.5.2.1
--- src/usr.sbin/sysinst/arch/zaurus/md.c:1.5 Sat Jul 13 17:13:40 2019
+++ src/usr.sbin/sysinst/arch/zaurus/md.c Sun Aug 18 13:19:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.5 2019/07/13 17:13:40 martin Exp $ */
+/* $NetBSD: md.c,v 1.5.2.1 2019/08/18 13:19:51 msaitoh Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -82,7 +82,7 @@ md_get_info(struct install_partition_des
select_part_scheme(pm, NULL, true, NULL);
if (!ps)
- return true;
+ return false;
struct disk_partitions *parts =
(*ps->create_new_for_disk)(pm->diskdev,
