Sat Nov 14 23:00:17 2015 UTC ()
Enable installation of amd64 on an lfsv2 partition.

XXX Other ports will need similar changes to arch/.../md.h after testing!

XXX The mount_lfs warning about lfs being experimental may confuse or
XXX corrupt the sysinst display window.


(pgoyette)
diff -r1.10 -r1.11 src/usr.sbin/sysinst/disks.c
diff -r1.1 -r1.2 src/usr.sbin/sysinst/arch/amd64/md.h
cvs diff -r1.10 -r1.11 src/usr.sbin/sysinst/disks.c (expand / switch to unified diff)

--- src/usr.sbin/sysinst/disks.c 2015/07/25 07:12:30 1.10
+++ src/usr.sbin/sysinst/disks.c 2015/11/14 23:00:17 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: disks.c,v 1.10 2015/07/25 07:12:30 isaki Exp $ */ 1/* $NetBSD: disks.c,v 1.11 2015/11/14 23:00:17 pgoyette 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 * Written by Philip A. Nelson for Piermont Information Systems Inc. 7 * Written by Philip A. Nelson for Piermont Information Systems Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -1304,29 +1304,29 @@ bootxx_name(void) @@ -1304,29 +1304,29 @@ bootxx_name(void)
1304 bootxxname = BOOTXX_FFSV2; 1304 bootxxname = BOOTXX_FFSV2;
1305#else 1305#else
1306 bootxxname = NULL; 1306 bootxxname = NULL;
1307#endif 1307#endif
1308 } else { 1308 } else {
1309#ifdef BOOTXX_FFSV1 1309#ifdef BOOTXX_FFSV1
1310 bootxxname = BOOTXX_FFSV1; 1310 bootxxname = BOOTXX_FFSV1;
1311#else 1311#else
1312 bootxxname = NULL; 1312 bootxxname = NULL;
1313#endif 1313#endif
1314 } 1314 }
1315 break; 1315 break;
1316#endif 1316#endif
1317#ifdef BOOTXX_LFS 1317#ifdef BOOTXX_LFSV2
1318 case FS_BSDLFS: 1318 case FS_BSDLFS:
1319 bootxxname = BOOTXX_LFS; 1319 bootxxname = BOOTXX_LFSV2;
1320 break; 1320 break;
1321#endif 1321#endif
1322 default: 1322 default:
1323 bootxxname = NULL; 1323 bootxxname = NULL;
1324 break; 1324 break;
1325 } 1325 }
1326 1326
1327 if (bootxxname == NULL) 1327 if (bootxxname == NULL)
1328 return NULL; 1328 return NULL;
1329 1329
1330 asprintf(&bootxx, "%s/%s", BOOTXXDIR, bootxxname); 1330 asprintf(&bootxx, "%s/%s", BOOTXXDIR, bootxxname);
1331 return bootxx; 1331 return bootxx;
1332} 1332}
cvs diff -r1.1 -r1.2 src/usr.sbin/sysinst/arch/amd64/md.h (expand / switch to unified diff)

--- src/usr.sbin/sysinst/arch/amd64/md.h 2014/07/26 19:30:44 1.1
+++ src/usr.sbin/sysinst/arch/amd64/md.h 2015/11/14 23:00:17 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: md.h,v 1.1 2014/07/26 19:30:44 dholland Exp $ */ 1/* $NetBSD: md.h,v 1.2 2015/11/14 23:00:17 pgoyette 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 * Written by Philip A. Nelson for Piermont Information Systems Inc. 7 * Written by Philip A. Nelson for Piermont Information Systems Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -56,26 +56,27 @@ @@ -56,26 +56,27 @@
56#define DEFAULT_UFS2 56#define DEFAULT_UFS2
57 57
58/* have support for booting from UFS2 */ 58/* have support for booting from UFS2 */
59#define HAVE_UFS2_BOOT 59#define HAVE_UFS2_BOOT
60 60
61/* allow using tmpfs for /tmp instead of mfs */ 61/* allow using tmpfs for /tmp instead of mfs */
62#define HAVE_TMPFS 62#define HAVE_TMPFS
63 63
64/* have file system specific primary boot loader */ 64/* have file system specific primary boot loader */
65#define HAVE_BOOTXX_xFS 65#define HAVE_BOOTXX_xFS
66#define BOOTXXDIR "/usr/mdec" 66#define BOOTXXDIR "/usr/mdec"
67#define BOOTXX_FFSV1 "bootxx_ffsv1" 67#define BOOTXX_FFSV1 "bootxx_ffsv1"
68#define BOOTXX_FFSV2 "bootxx_ffsv2" 68#define BOOTXX_FFSV2 "bootxx_ffsv2"
 69#define BOOTXX_LFSV2 "bootxx_lfsv2"
69 70
70 71
71/* 72/*
72 * Default filesets to fetch and install during installation 73 * Default filesets to fetch and install during installation
73 * or upgrade. The standard sets are: 74 * or upgrade. The standard sets are:
74 * base etc comp games man misc tests text xbase xcomp xetc xfont xserver 75 * base etc comp games man misc tests text xbase xcomp xetc xfont xserver
75 * 76 *
76 * x86_64 has the MD set kern first, because generic kernels are too 77 * x86_64 has the MD set kern first, because generic kernels are too
77 * big to fit on install floppies. 78 * big to fit on install floppies.
78 * 79 *
79 * Third entry is the last extension name in the split sets for loading 80 * Third entry is the last extension name in the split sets for loading
80 * from floppy. 81 * from floppy.
81 */ 82 */