Module Name: src
Committed By: pooka
Date: Wed Jan 26 10:58:20 UTC 2011
Modified Files:
src/distrib/utils/sysinst: defs.h main.c
src/distrib/utils/sysinst/arch/emips: md.h
Log Message:
make this build on non-emips again
To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 src/distrib/utils/sysinst/defs.h
cvs rdiff -u -r1.55 -r1.56 src/distrib/utils/sysinst/main.c
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/sysinst/arch/emips/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/distrib/utils/sysinst/defs.h
diff -u src/distrib/utils/sysinst/defs.h:1.149 src/distrib/utils/sysinst/defs.h:1.150
--- src/distrib/utils/sysinst/defs.h:1.149 Sat Dec 4 14:57:56 2010
+++ src/distrib/utils/sysinst/defs.h Wed Jan 26 10:58:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.149 2010/12/04 14:57:56 jmmv Exp $ */
+/* $NetBSD: defs.h,v 1.150 2011/01/26 10:58:19 pooka Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -160,6 +160,11 @@
#define PI_ISBSDFS(p) ((p)->pi_fstype == FS_BSDLFS || \
(p)->pi_fstype == FS_BSDFFS)
+/* non-standard cd0 driver */
+#ifndef CD_NAME
+#define CD_NAME "cd0a"
+#endif
+
/* Types */
typedef struct distinfo {
const char *name;
Index: src/distrib/utils/sysinst/main.c
diff -u src/distrib/utils/sysinst/main.c:1.55 src/distrib/utils/sysinst/main.c:1.56
--- src/distrib/utils/sysinst/main.c:1.55 Wed Jan 26 01:18:46 2011
+++ src/distrib/utils/sysinst/main.c Wed Jan 26 10:58:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.55 2011/01/26 01:18:46 pooka Exp $ */
+/* $NetBSD: main.c,v 1.56 2011/01/26 10:58:19 pooka Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -82,10 +82,6 @@
int size;
};
-#ifndef CD_NAME
-#define CD_NAME "cd0a"
-#endif
-
static const struct f_arg fflagopts[] = {
{"release", REL, rel, sizeof rel},
{"machine", MACH, machine, sizeof machine},
Index: src/distrib/utils/sysinst/arch/emips/md.h
diff -u src/distrib/utils/sysinst/arch/emips/md.h:1.1 src/distrib/utils/sysinst/arch/emips/md.h:1.2
--- src/distrib/utils/sysinst/arch/emips/md.h:1.1 Wed Jan 26 01:18:46 2011
+++ src/distrib/utils/sysinst/arch/emips/md.h Wed Jan 26 10:58:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.1 2011/01/26 01:18:46 pooka Exp $ */
+/* $NetBSD: md.h,v 1.2 2011/01/26 10:58:20 pooka Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -87,4 +87,8 @@
#define MD_SETS_VALID SET_KERNEL, SET_SYSTEM, SET_X11_NOSERVERS
/* default install CD device is ace1a */
+/* XXX: not pretty */
+#ifdef CD_NAME
+#undef CD_NAME
+#endif
#define CD_NAME "ace1a"
