--- elwix/config/elwix_firmware.conf	2012/02/23 09:39:38	1.2.4.4
+++ elwix/config/elwix_firmware.conf	2013/10/15 10:34:33	1.7.4.2
@@ -4,41 +4,37 @@
 #
 # ELWIX RootFS crunchgen config
 #
-# $Id: elwix_firmware.conf,v 1.2.4.4 2012/02/23 09:39:38 misho Exp $
+# $Id: elwix_firmware.conf,v 1.7.4.2 2013/10/15 10:34:33 misho Exp $
 #
 
 #srcdirs /usr/src/bin /usr/src/sbin /usr/src/libexec /usr/src/cddl/sbin /usr/src/sbin/ggate
-#buildopts -DRESCUE CRUNCH_CFLAGS=-DRESCUE
+#buildopts -DRESCUE CRUNCH_CFLAGS=-DRESCUE -DRELEASE_CRUNCH
 
 # /bin
-progs test cat chflags chio chmod cp date dd df domainname echo expr getfacl hostname
-progs kenv kill ln ls mkdir mv pax pkill ps pwait pwd realpath rm rmdir setfacl sh
-progs sleep stty sync uuidgen csh
+progs test cat chflags chio chmod cp date dd df domainname echo expr hostname
+progs kenv kill ln ls mkdir mv pax pkill ps pwait pwd realpath rm rmdir sh
+progs sleep stty sync uuidgen
 
-special csh buildopts -D_PATH_TCSHELL='"/bin/csh"'
-
-ln csh -csh
-ln csh tcsh
-ln csh -tcsh
 ln sh -sh
 ln test [
 ln ln link
 ln pkill pgrep
 ln rm unlink
 
-libs -ledit -lkvm -ll -ltermcap -lcurses -lcrypt -lncurses
+libs -ledit -lkvm -ll -lcurses -lcrypt -lncurses
 
 # /sbin
 # cp dhclient-script -> rootfs
 # cp nextboot -> rootfs
-progs adjkerntz atacontrol badsect bsdlabel camcontrol ccdconfig comcontrol conscontrol
-progs devfs dhclient dmesg dump dumpfs dumpon fdisk ffsinfo fsck reboot
-progs fsck_ffs fsck_msdosfs gbde ggatec ggated ggatel growfs hastctl hastd ifconfig
+# progs mksnap_ffs mdmfs mount mount_cd9660 mount_msdosfs mount_nfs mount_nullfs
+progs bsdlabel camcontrol comcontrol conscontrol etherswitchcfg nvmecontrol
+progs devfs dhclient dmesg dump dumpon fdisk fsck reboot
+progs fsck_ffs fsck_msdosfs growfs hastctl hastd ifconfig
 progs init ipfw iscontrol kldconfig kldload kldstat kldunload ldconfig md5 mdconfig mknod
-progs mksnap_ffs mdmfs mount mount_cd9660 mount_msdosfs mount_nfs mount_ntfs mount_nullfs
-progs mount_udf mount_unionfs natd newfs newfs_msdos nfsiod nos-tun
+progs mksnap_ffs mdmfs mount mount_cd9660 mount_msdosfs mount_nfs mount_nullfs
+progs mount_udf mount_unionfs newfs newfs_msdos nfsiod nos-tun
 progs pfctl pflogd ping ping6 quotacheck recoverdisk restore route rtsol savecore
-progs setkey shutdown spppcontrol swapon sysctl tunefs umount zfs zpool geom
+progs shutdown swapon sysctl tunefs umount zfs zpool geom
 
 special geom buildopts -DSTATIC_GEOM_CLASSES -DRESCUE CRUNCH_CFLAGS=-DRESCUE
 
@@ -59,6 +55,7 @@ ln geom glabel
 #ln geom gmultipath
 #ln geom gnop
 ln geom gpart
+ln geom graid
 #ln geom graid3
 #ln geom gsched
 #ln geom gshsec
@@ -74,15 +71,17 @@ ln swapon swapctl
 ln swapon swapoff
 ln geom -geom
 
-libs -lthr -lalias -lcam -lcurses -ldevstat -lipsec -lzfs -lnvpair -luutil -lavl -lipx
+libs -lthr -lalias -lcam -ldevstat -lipsec -luutil -lavl -lipx
 libs -lgeom -lbsdxml -ljail -lkiconv -lsbuf -lufs -lz -lm -lpcap
-libs -lssl -lumem -lsbuf
+libs -lssl -lsbuf -lzfs_core -lzpool -lzfs -lnvpair -lumem
 
 # usr.bin
 progs true false basename tail nc w head uname tset vmstat systat tar cpio tput
 progs grep awk less gzip cap_mkdb sed vi du getopt bzip2
 progs logger nice nohup seq sockstat stat tee tftp touch wc xargs printenv
 
+special vi buildopts -DRESCUE CRUNCH_CFLAGS=-DRESCUE -DRELEASE_CRUNCH
+
 ln awk nawk
 ln grep egrep
 ln grep fgrep
@@ -96,7 +95,7 @@ ln tset reset
 ln stat readlink
 ln w uptime
 
-libs -lmemstat -lncursesw -larchive -lbz2 -llzma -lnetgraph
+libs -lmemstat -larchive -lbz2 -llzma -lnetgraph
 
 # usr.sbin
 progs chown pwd_mkdb arp gpioctl hostapd hostapd_cli wpa_supplicant wpa_cli inetd