Module Name: src
Committed By: pgoyette
Date: Sat Nov 14 23:00:17 UTC 2015
Modified Files:
src/usr.sbin/sysinst: disks.c
src/usr.sbin/sysinst/arch/amd64: md.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/sysinst/disks.c
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/amd64/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/usr.sbin/sysinst/disks.c
diff -u src/usr.sbin/sysinst/disks.c:1.10 src/usr.sbin/sysinst/disks.c:1.11
--- src/usr.sbin/sysinst/disks.c:1.10 Sat Jul 25 07:12:30 2015
+++ src/usr.sbin/sysinst/disks.c Sat Nov 14 23:00:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.10 2015/07/25 07:12:30 isaki Exp $ */
+/* $NetBSD: disks.c,v 1.11 2015/11/14 23:00:17 pgoyette Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1314,9 +1314,9 @@ bootxx_name(void)
}
break;
#endif
-#ifdef BOOTXX_LFS
+#ifdef BOOTXX_LFSV2
case FS_BSDLFS:
- bootxxname = BOOTXX_LFS;
+ bootxxname = BOOTXX_LFSV2;
break;
#endif
default:
Index: src/usr.sbin/sysinst/arch/amd64/md.h
diff -u src/usr.sbin/sysinst/arch/amd64/md.h:1.1 src/usr.sbin/sysinst/arch/amd64/md.h:1.2
--- src/usr.sbin/sysinst/arch/amd64/md.h:1.1 Sat Jul 26 19:30:44 2014
+++ src/usr.sbin/sysinst/arch/amd64/md.h Sat Nov 14 23:00:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.1 2014/07/26 19:30:44 dholland Exp $ */
+/* $NetBSD: md.h,v 1.2 2015/11/14 23:00:17 pgoyette Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -66,6 +66,7 @@
#define BOOTXXDIR "/usr/mdec"
#define BOOTXX_FFSV1 "bootxx_ffsv1"
#define BOOTXX_FFSV2 "bootxx_ffsv2"
+#define BOOTXX_LFSV2 "bootxx_lfsv2"
/*
