Module Name: src
Committed By: skrll
Date: Mon Jan 9 11:44:54 UTC 2012
Modified Files:
src/usr.sbin/installboot/arch: hp700.c
Log Message:
Make it an error for the partition to exceed the PDC limit.
Inspired by PR/45742
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/installboot/arch/hp700.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/installboot/arch/hp700.c
diff -u src/usr.sbin/installboot/arch/hp700.c:1.4 src/usr.sbin/installboot/arch/hp700.c:1.5
--- src/usr.sbin/installboot/arch/hp700.c:1.4 Mon Apr 28 20:24:16 2008
+++ src/usr.sbin/installboot/arch/hp700.c Mon Jan 9 11:44:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: hp700.c,v 1.4 2008/04/28 20:24:16 martin Exp $ */
+/* $NetBSD: hp700.c,v 1.5 2012/01/09 11:44:53 skrll Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#if !defined(__lint)
-__RCSID("$NetBSD: hp700.c,v 1.4 2008/04/28 20:24:16 martin Exp $");
+__RCSID("$NetBSD: hp700.c,v 1.5 2012/01/09 11:44:53 skrll Exp $");
#endif /* !__lint */
/* We need the target disklabel.h, not the hosts one..... */
@@ -178,9 +178,10 @@ hp700_setboot(ib_params *params)
} else if (be32toh(label.l.d_partitions[0].p_offset) +
be32toh(label.l.d_partitions[0].p_size) >
((unsigned)2*1024*1024*1024) / secsize) {
- warnx("WARNING: Partition `a' of `%s' exceeds 2GB boundary.",
+ warnx("Partition `a' of `%s' exceeds 2GB boundary.",
params->filesystem);
- warnx("WARNING: It won't boot since hp700 PDC can handle only 2GB.");
+ warnx("It won't boot since hp700 PDC can handle only 2GB.");
+ goto done;
}
/* read boot loader */
