--- elwix/config/elwix_firmware.conf	2012/02/09 01:27:57	1.2.4.1
+++ elwix/config/elwix_firmware.conf	2013/07/24 12:32:50	1.6.2.2
@@ -4,41 +4,40 @@
 #
 # ELWIX RootFS crunchgen config
 #
-# $Id: elwix_firmware.conf,v 1.2.4.1 2012/02/09 01:27:57 misho Exp $
+# $Id: elwix_firmware.conf,v 1.6.2.2 2013/07/24 12:32:50 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
 
 # /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
+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 csh
 
-#special csh buildopts -D_PATH_TCSHELL='"/bin/csh"'
-
-#ln csh -csh
-#ln csh tcsh
-#ln csh -tcsh
 ln sh -sh
+ln csh -csh
+ln csh tcsh
+ln csh -tcsh
 ln test [
 ln ln link
 ln pkill pgrep
 ln rm unlink
 
-libs -lcrypt -ledit -lkvm -ll -ltermcap -lutil -lcurses -lncurses
+libs -ledit -lkvm -ll -ltermcap -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 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 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 ipfw iscontrol kldconfig kldload kldstat kldunload ldconfig md5 mdconfig mknod
+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 +58,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,42 +74,43 @@ ln swapon swapctl
 ln swapon swapoff
 ln geom -geom
 
-libs -lalias -lcam -lcurses -ldevstat -lipsec -lzfs -lnvpair -luutil -lavl -lipx
-libs -lgeom -lbsdxml -ljail -lkiconv -lmd -lreadline -lsbuf -lufs -lz -lm -lpcap
-libs -lcrypto -lthr -lumem -lsbuf
+libs -lthr -lalias -lcam -lcurses -ldevstat -lipsec -luutil -lavl -lipx
+libs -lgeom -lbsdxml -ljail -lkiconv -lsbuf -lufs -lz -lm -lpcap
+libs -lssl -lsbuf -lzfs_core -lzpool -lzfs -lnvpair -lumem
 
 # usr.bin
-progs true false basename tail nc w head uname tset vmstat systat bsdtar bsdcpio tput
-progs bsdgrep grep awk less passwd gzip cap_mkdb netstat sed vi du getopt cu
-progs logger login nice nohup seq sockstat stat tee tftp touch wc xargs
-progs ssh scp sftp ssh-keygen printenv
+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
 
 ln awk nawk
-ln bsdcpio cpio
-ln bsdtar tar
 ln grep egrep
 ln grep fgrep
 ln gzip gunzip
+ln gzip zcat
+ln gzip gzcat
+ln bzip2 bunzip2
+ln bzip2 bzcat
 ln less more
 ln tset reset
 ln stat readlink
 ln w uptime
-ln cu tip
-ln ssh slogin
 
-libs -lmemstat -lncursesw -larchive -lbz2 -llzma -lgnuregex -lpam -lnetgraph -lbsm
+libs -lmemstat -lncursesw -larchive -lbz2 -llzma -lnetgraph
 
 # usr.sbin
 progs chown pwd_mkdb arp gpioctl hostapd hostapd_cli wpa_supplicant wpa_cli inetd
-progs wlandebug tcpdump chroot cron i2c iostat jail jexec jls ndp newsyslog nologin
-progs ntpdate pstat rtadvctl rtadvd rtsold syslogd setfib wpa_passphrase wake
-progs watchdog traceroute traceroute6 sshd
+progs wlandebug chroot i2c iostat ndp newsyslog nologin
+progs pstat rtadvctl rtadvd rtsold syslogd setfib wpa_passphrase wake
+progs watchdogd traceroute traceroute6
 
+progs passwd login
+
 ln pstat swapinfo
-ln watchdog watchdogd
+ln watchdogd watchdog
 ln chown chgrp
 
-libs -lssl -lwrap -lrt -lssh -lgssapi_krb5 -lgssapi -lkrb5 -lasn1 -lhx509 -lcom_err -lroken
+libs -lwrap -lulog -lutil -lcrypto -lmd
 
 # usr.libexec
-progs getty sftp-server tftpd
+progs getty tftpd