Mon Mar 9 17:10:31 2020 UTC ()
The (unused) md_pre_disklabel() function needs to return success, otherwise
all installations will be aborted.


(martin)
diff -r1.7 -r1.8 src/usr.sbin/sysinst/arch/alpha/md.c

cvs diff -r1.7 -r1.8 src/usr.sbin/sysinst/arch/alpha/md.c (expand / switch to unified diff)

--- src/usr.sbin/sysinst/arch/alpha/md.c 2019/12/15 13:39:24 1.7
+++ src/usr.sbin/sysinst/arch/alpha/md.c 2020/03/09 17:10:31 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: md.c,v 1.7 2019/12/15 13:39:24 martin Exp $ */ 1/* $NetBSD: md.c,v 1.8 2020/03/09 17:10:31 martin Exp $ */
2 2
3/* 3/*
4 * Copyright 1997 Piermont Information Systems Inc. 4 * Copyright 1997 Piermont Information Systems Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Based on code written by Philip A. Nelson for Piermont Information 7 * Based on code written by Philip A. Nelson for Piermont Information
8 * Systems Inc. 8 * Systems Inc.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -116,27 +116,27 @@ md_make_bsd_partitions(struct install_pa @@ -116,27 +116,27 @@ md_make_bsd_partitions(struct install_pa
116bool 116bool
117md_check_partitions(struct install_partition_desc *install) 117md_check_partitions(struct install_partition_desc *install)
118{ 118{
119 return 1; 119 return 1;
120} 120}
121 121
122/* 122/*
123 * hook called before writing new disklabel. 123 * hook called before writing new disklabel.
124 */ 124 */
125bool 125bool
126md_pre_disklabel(struct install_partition_desc *install, 126md_pre_disklabel(struct install_partition_desc *install,
127 struct disk_partitions *part) 127 struct disk_partitions *part)
128{ 128{
129 return 0; 129 return true;
130} 130}
131 131
132/* 132/*
133 * hook called after writing disklabel to new target disk. 133 * hook called after writing disklabel to new target disk.
134 */ 134 */
135bool 135bool
136md_post_disklabel(struct install_partition_desc *install, 136md_post_disklabel(struct install_partition_desc *install,
137 struct disk_partitions *part) 137 struct disk_partitions *part)
138{ 138{
139 return true; 139 return true;
140} 140}
141 141
142/* 142/*