--- elwix/config/elwix_firmware.conf	2012/02/23 09:39:38	1.2.4.4
+++ elwix/config/elwix_firmware.conf	2012/05/28 23:19:05	1.2.4.5
@@ -4,18 +4,18 @@
 #
 # 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.2.4.5 2012/05/28 23:19:05 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
 
 # /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 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"'
+special csh buildopts -DRESCUE -D_PATH_TCSHELL='"/bin/csh"'
 
 ln csh -csh
 ln csh tcsh
@@ -31,14 +31,14 @@ libs -ledit -lkvm -ll -ltermcap -lcurses -lcrypt -lncu
 # /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 atacontrol bsdlabel camcontrol comcontrol conscontrol
+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 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