Module Name: src
Committed By: khorben
Date: Tue Jul 16 02:10:43 UTC 2013
Modified Files:
src/distrib/i386: Makefile
src/distrib/i386/ramdisks: Makefile
Added Files:
src/distrib/i386/kmod-cgdroot: Makefile
src/distrib/i386/ramdisks/ramdisk-cgdroot: Makefile list
Log Message:
This is the i386 version of the support for full-disk encryption; this commit
allows building the ramdisk required as well as the associated kernel module
(to be loaded in the kernel by the bootloader).
This was tested on my Lenovo ThinkPad X301 just like for the amd64 port.
XXX implement support for full-disk encryption installs in sysinst
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/i386/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/i386/kmod-cgdroot/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/i386/ramdisks/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/i386/ramdisks/ramdisk-cgdroot/Makefile \
src/distrib/i386/ramdisks/ramdisk-cgdroot/list
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/i386/Makefile
diff -u src/distrib/i386/Makefile:1.9 src/distrib/i386/Makefile:1.10
--- src/distrib/i386/Makefile:1.9 Sun Jan 22 03:53:32 2012
+++ src/distrib/i386/Makefile Tue Jul 16 02:10:43 2013
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2012/01/22 03:53:32 tsutsui Exp $
+# $NetBSD: Makefile,v 1.10 2013/07/16 02:10:43 khorben Exp $
SUBDIR=
SUBDIR+= ramdisks
SUBDIR+= .WAIT
SUBDIR+= instkernel
SUBDIR+= kmod
+SUBDIR+= kmod-cgdroot
SUBDIR+= .WAIT
SUBDIR+= cdroms
SUBDIR+= floppies
Index: src/distrib/i386/ramdisks/Makefile
diff -u src/distrib/i386/ramdisks/Makefile:1.3 src/distrib/i386/ramdisks/Makefile:1.4
--- src/distrib/i386/ramdisks/Makefile:1.3 Fri May 2 23:13:06 2008
+++ src/distrib/i386/ramdisks/Makefile Tue Jul 16 02:10:43 2013
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2008/05/02 23:13:06 ad Exp $
+# $NetBSD: Makefile,v 1.4 2013/07/16 02:10:43 khorben Exp $
SUBDIR=
SUBDIR+= ramdisk-big
+SUBDIR+= ramdisk-cgdroot
TARGETS+= release
Added files:
Index: src/distrib/i386/kmod-cgdroot/Makefile
diff -u /dev/null src/distrib/i386/kmod-cgdroot/Makefile:1.1
--- /dev/null Tue Jul 16 02:10:43 2013
+++ src/distrib/i386/kmod-cgdroot/Makefile Tue Jul 16 02:10:43 2013
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.1 2013/07/16 02:10:43 khorben Exp $
+
+MINIROOT= cgdroot
+RAMDISK= ramdisk-cgdroot
+
+.include "../../common/Makefile.minirootkmod"
Index: src/distrib/i386/ramdisks/ramdisk-cgdroot/Makefile
diff -u /dev/null src/distrib/i386/ramdisks/ramdisk-cgdroot/Makefile:1.1
--- /dev/null Tue Jul 16 02:10:43 2013
+++ src/distrib/i386/ramdisks/ramdisk-cgdroot/Makefile Tue Jul 16 02:10:43 2013
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2013/07/16 02:10:43 khorben Exp $
+
+BOOTMODEL= big
+IMAGE= ramdisk-cgdroot.fs
+IMAGESIZE= 5000k
+IMAGEDEPENDS=
+CRUNCHENV= INIT_CHROOT=1
+SMALLPROG_INET6=1
+
+.include "${.CURDIR}/../common/Makefile.ramdisk"
+
+LISTS+= ${DISTRIBDIR}/common/list.cgdroot
+MTREECONF+= ${DISTRIBDIR}/common/mtree.cgdroot
+
+.if ${USE_INET6} != "no"
+LISTS+= ${DISTRIBDIR}/common/list.inet6
+.endif
+
+MAKEFS_FLAGS+= -f 20
Index: src/distrib/i386/ramdisks/ramdisk-cgdroot/list
diff -u /dev/null src/distrib/i386/ramdisks/ramdisk-cgdroot/list:1.1
--- /dev/null Tue Jul 16 02:10:43 2013
+++ src/distrib/i386/ramdisks/ramdisk-cgdroot/list Tue Jul 16 02:10:43 2013
@@ -0,0 +1,32 @@
+# $NetBSD: list,v 1.1 2013/07/16 02:10:43 khorben Exp $
+
+PROG bin/chio
+PROG bin/dd
+PROG bin/df
+PROG bin/ed
+PROG bin/mt
+PROG bin/rcmd
+PROG bin/sync
+
+PROG libexec/lfs_cleanerd
+
+PROG sbin/dkctl
+PROG sbin/fdisk
+PROG sbin/mbrlabel
+PROG sbin/mount_ext2fs
+PROG sbin/mount_lfs
+PROG sbin/mount_ntfs
+PROG sbin/newfs_lfs
+PROG sbin/raidctl
+PROG sbin/restore sbin/rrestore
+PROG sbin/scsictl
+PROG sbin/shutdown
+PROG sbin/slattach
+PROG sbin/sysctl
+
+PROG usr/bin/less usr/bin/more
+PROG usr/bin/tip
+
+PROG usr/sbin/installboot
+
+PROG usr/sbin/wiconfig
