--- elwix/config/elwix_romfs.conf	2013/07/29 09:03:57	1.5.2.1
+++ elwix/config/elwix_romfs.conf	2013/07/29 09:25:00	1.5.2.2
@@ -3,453 +3,27 @@
 # (C)`10 AITNET - Sofia/Bulgaria - misho@aitbg.com
 #  Michael Pounov
 #
-# $Id: elwix_romfs.conf,v 1.5.2.1 2013/07/29 09:03:57 misho Exp $
+# $Id: elwix_romfs.conf,v 1.5.2.2 2013/07/29 09:25:00 misho Exp $
 #
 # Lines with colons (':') in them list files that should be hard-linked
 # to each other, e.g.
 #     bin/link:bin/ln
 
-# contents of /usr/bin
-usr/bin/apropos:usr/bin/man:usr/bin/manpath:usr/bin/whatis
-usr/bin/at:usr/bin/atq:usr/bin/atrm:usr/bin/batch
-#usr/bin/awk:usr/bin/nawk
-#usr/bin/basename
-#usr/bin/bsdcpio:usr/bin/cpio
-#usr/bin/bsdgrep:usr/bin/lzegrep:usr/bin/lzfgrep:usr/bin/lzgrep:usr/bin/xzegrep:usr/bin/xzfgrep:usr/bin/xzgrep
-usr/bin/bsdiff
-#usr/bin/bsdtar:usr/bin/tar
-usr/bin/bsnmpget:usr/bin/bsnmpset:usr/bin/bsnmpwalk
-usr/bin/bspatch
-usr/bin/bthost
-usr/bin/btsockstat
-#usr/bin/bunzip2:usr/bin/bzcat:usr/bin/bzip2
-usr/bin/bzip2recover
-#usr/bin/cap_mkdb
-usr/bin/chat
-#usr/bin/chgrp
-usr/bin/compress:usr/bin/uncompress
-usr/bin/cpuset
-usr/bin/crontab
-usr/bin/cu:usr/bin/tip
-usr/bin/cut
-usr/bin/dialog
-usr/bin/diff
-usr/bin/dirname
-#usr/bin/du
-#usr/bin/egrep:usr/bin/fgrep:usr/bin/grep:usr/bin/bzegrep:usr/bin/bzfgrep:usr/bin/bzgrep:usr/bin/zegrep:usr/bin/zfgrep:usr/bin/zgrep
-usr/bin/env
-#usr/bin/false
-usr/bin/fetch
-usr/bin/find
-usr/bin/fstat
-usr/bin/fsync
-usr/bin/gdbserver
-#usr/bin/getopt
-#usr/bin/gunzip:usr/bin/gzcat:usr/bin/gzip:usr/bin/zcat
-usr/bin/gzexe
-#usr/bin/head
-usr/bin/host
-usr/bin/id:usr/bin/whoami:usr/bin/groups
-usr/bin/install
-usr/bin/ipcrm
-usr/bin/ipcs
-usr/bin/killall
-usr/bin/last
-usr/bin/lastcomm
-usr/bin/ldd
-#usr/bin/less:usr/bin/more
-usr/bin/lesspipe.sh
-usr/bin/limits
-usr/bin/lockf
-#usr/bin/logger
-usr/bin/login
-#usr/bin/logins
-usr/bin/lp
-usr/bin/lpq
-usr/bin/lpr
-usr/bin/lprm
-usr/bin/lsvfs
-usr/bin/lzcat:usr/bin/lzma:usr/bin/unlzma:usr/bin/unxz:usr/bin/xz:usr/bin/xzcat
-usr/bin/lzdec:usr/bin/xzdec
-usr/bin/lzmainfo
-usr/bin/minigzip
-usr/bin/mkfifo
-usr/bin/mktemp
-usr/bin/mkuzip
-usr/bin/mt
-#usr/bin/nc
-usr/bin/netstat
-usr/bin/newgrp
-usr/bin/nfsstat
-#usr/bin/nice
-#usr/bin/nohup
-#usr/bin/ntpq
-usr/bin/nslookup
-usr/bin/nsupdate
-usr/bin/openssl
-usr/bin/opieinfo
-usr/bin/opiekey:usr/bin/otp-md4:usr/bin/otp-md5:usr/bin/otp-sha
-usr/bin/opiepasswd
-usr/bin/passwd
-usr/bin/patch
-usr/bin/pawd
-#usr/bin/printenv
-usr/bin/printf
-usr/bin/quota
-usr/bin/rctl
-usr/bin/renice
-#usr/bin/reset:usr/bin/tset
-usr/bin/revoke
-usr/bin/rfcomm_sppd
-usr/bin/rpcinfo
-usr/bin/rup
-#usr/bin/ruptime
-usr/bin/rusers
-usr/bin/rwall
-#usr/bin/rwho
-usr/bin/scp
-#usr/bin/sed
-#usr/bin/seq
-usr/bin/sftp
-usr/bin/showmount
-usr/bin/size
-usr/bin/smbutil
-#usr/bin/sockstat
-usr/bin/sort
-usr/bin/split
-usr/bin/ssh:usr/bin/slogin
-usr/bin/ssh-add
-usr/bin/ssh-agent
-usr/bin/ssh-keygen
-usr/bin/ssh-keyscan
-#usr/bin/stat:usr/bin/readlink
-usr/bin/su
-#usr/bin/systat
-#usr/bin/tail
-#usr/bin/tee
-usr/bin/telnet
-#usr/bin/tftp
-usr/bin/time
-usr/bin/top
-#usr/bin/touch
-#usr/bin/tput
-usr/bin/tr
-#usr/bin/true
-usr/bin/truncate
-usr/bin/truss
-usr/bin/tty
-#usr/bin/uname
-usr/bin/uniq
-usr/bin/unzip
-#usr/bin/uptime:usr/bin/w
-usr/bin/usbhidaction
-usr/bin/usbhidctl
-#usr/bin/users
-usr/bin/uudecode:usr/bin/b64decode
-usr/bin/uuencode:usr/bin/b64encode
-#usr/bin/vi:usr/bin/view:usr/bin/nex:usr/bin/nvi:usr/bin/nview
-#usr/bin/vmstat
-usr/bin/wall
-#usr/bin/wc
-usr/bin/who
-usr/bin/whois
-usr/bin/write
-#usr/bin/xargs
-usr/bin/yes
-
-usr/bin/csh:usr/bin/tcsh
-usr/bin/sqlite3
-
-# contents of usr/sbin
-usr/sbin/ac
-usr/sbin/accton
-#usr/sbin/acpiconf
-usr/sbin/adduser
-usr/sbin/amd
-usr/sbin/amq
-usr/sbin/ancontrol
-#usr/sbin/apm
-#usr/sbin/apmd
-#usr/sbin/arp
-usr/sbin/ath3kfw
-usr/sbin/authpf
-usr/sbin/bcmfw
-usr/sbin/boot0cfg
-usr/sbin/bootparamd
-usr/sbin/bootpef
-usr/sbin/bootptest
-usr/sbin/bsnmpd
-usr/sbin/bt3cfw
-usr/sbin/bthidcontrol
-usr/sbin/bthidd
-usr/sbin/btpand
-usr/sbin/btxld
-usr/sbin/burncd
-usr/sbin/callbootd
-usr/sbin/cdcontrol
-#usr/sbin/chown:usr/bin/chgrp
-#usr/sbin/chroot
-usr/sbin/clear_locks
-usr/sbin/cpucontrol
-usr/sbin/cron
-usr/sbin/devinfo
-usr/sbin/digictl
-usr/sbin/diskinfo
-usr/sbin/edquota
-usr/sbin/extattrctl
-usr/sbin/faithd
-#usr/sbin/fdcontrol
-#usr/sbin/fdformat
-#usr/sbin/fdread
-#usr/sbin/fdwrite
-usr/sbin/fifolog_create
-usr/sbin/fifolog_reader
-usr/sbin/fifolog_writer
-usr/sbin/fixmount
-usr/sbin/flowctl
-usr/sbin/fsinfo
-usr/sbin/ftp-proxy
-usr/sbin/fwcontrol
-usr/sbin/getextattr:usr/sbin/lsextattr:usr/sbin/rmextattr:usr/sbin/setextattr
-#usr/sbin/gpioctl
-usr/sbin/gstat
-usr/sbin/hccontrol
-usr/sbin/hcsecd
-usr/sbin/hcseriald
-#usr/sbin/hlfsd
-#usr/sbin/hostapd
-#usr/sbin/hostapd_cli
-#usr/sbin/i2c
-usr/sbin/idprio:usr/sbin/rtprio
-usr/sbin/ifmcstat
-#usr/sbin/inetd
-#usr/sbin/iostat
-usr/sbin/ip6addrctl
-usr/sbin/ipfwpcap
-usr/sbin/jail
-usr/sbin/jexec
-usr/sbin/jls
-#usr/sbin/kldxref
-usr/sbin/l2control
-usr/sbin/l2ping
-usr/sbin/lastlogin
-usr/sbin/lmcconfig
-usr/sbin/lockstat
-usr/sbin/lpc
-usr/sbin/lpd
-usr/sbin/lptcontrol
-usr/sbin/lptest
-usr/sbin/memcontrol
-usr/sbin/mfiutil
-usr/sbin/mixer
-usr/sbin/mk-amd-map
-usr/sbin/mld6query
-usr/sbin/mlxcontrol
-usr/sbin/mountd
-#usr/sbin/mptable
-usr/sbin/mptutil
-usr/sbin/mtree
-usr/sbin/named:usr/sbin/lwresd
-usr/sbin/ndis_events
-usr/sbin/ndiscvt
-usr/sbin/ndisgen
-usr/sbin/ndp
-#usr/sbin/newsyslog
-usr/sbin/nfscbd
-usr/sbin/nfsd
-usr/sbin/nfsdumpstate
-usr/sbin/nfsrevoke
-usr/sbin/nfsuserd
-usr/sbin/ngctl
-usr/sbin/nghook
-#usr/sbin/nologin
-#usr/sbin/nscd
-#usr/sbin/ntp-keygen
-#usr/sbin/ntpd
-#usr/sbin/ntpdc
-#usr/sbin/ntpdate
-#usr/sbin/ntptime
-usr/sbin/pciconf
-#usr/sbin/pkg_add
-#usr/sbin/pkg_create
-#usr/sbin/pkg_delete
-#usr/sbin/pkg_info
-#usr/sbin/pkg_updating
-#usr/sbin/pkg_version
-usr/sbin/pmccontrol
-usr/sbin/pmcstat
-usr/sbin/pnpinfo
-usr/sbin/powerd
-usr/sbin/ppp
-usr/sbin/pppctl
-usr/sbin/procctl
-#usr/sbin/pstat:usr/sbin/swapinfo
-usr/sbin/pw
-#usr/sbin/pwd_mkdb
-usr/sbin/quot
-usr/sbin/quotaon:usr/sbin/quotaoff
-usr/sbin/rarpd
-usr/sbin/repquota
-usr/sbin/rfcomm_pppd
-usr/sbin/rndc
-#usr/sbin/rndc-confgen
-usr/sbin/rpc.lockd
-usr/sbin/rpc.statd
-usr/sbin/rpc.umntall
-usr/sbin/rpcbind
-usr/sbin/rrenumd
-#usr/sbin/rtadvctl
-#usr/sbin/rtadvd
-#usr/sbin/rtsold
-#usr/sbin/rwhod
-usr/sbin/sa
-usr/sbin/sdpcontrol
-usr/sbin/sdpd
-usr/sbin/services_mkdb
-#usr/sbin/setfib
-usr/sbin/smbmsg
-usr/sbin/snapinfo
-usr/sbin/spkrtest
-usr/sbin/spray
-usr/sbin/sshd
-#usr/sbin/syslogd
-usr/sbin/tcpdchk
-usr/sbin/tcpdmatch
-usr/sbin/tcpdrop
-usr/sbin/tcpdump
-#usr/sbin/traceroute
-#usr/sbin/traceroute6
-usr/sbin/uathload
-usr/sbin/ugidfw
-usr/sbin/uhsoctl
-#usr/sbin/usbconfig
-usr/sbin/usbdump
-usr/sbin/vipw
-#usr/sbin/wake
-usr/sbin/watch
-#usr/sbin/watchdog:usr/sbin/watchdogd
-usr/sbin/wire-test
-#usr/sbin/wlandebug
-usr/sbin/wlconfig
-#usr/sbin/wpa_cli
-#usr/sbin/wpa_passphrase
-#usr/sbin/wpa_supplicant
-usr/sbin/zdb
-usr/sbin/zzz
-
-# contents of /usr/libexec
-usr/libexec/atrun
-usr/libexec/bootpd
-usr/libexec/bootpgw
-usr/libexec/getty
-usr/libexec/pppoed
-usr/libexec/rbootd
-#usr/libexec/revnetgroup
-usr/libexec/rpc.rquotad
-usr/libexec/rpc.rstatd
-usr/libexec/rpc.rusersd
-usr/libexec/rpc.rwalld
-usr/libexec/rpc.sprayd
-usr/libexec/save-entropy
-usr/libexec/sftp-server
-usr/libexec/ssh-keysign
-usr/libexec/ssh-pkcs11-helper
-usr/libexec/tcpd
-usr/libexec/telnetd
-usr/libexec/tftp-proxy
-#usr/libexec/tftpd
-
-# contents of /usr/share
-usr/share/misc/termcap
-usr/share/zoneinfo/Etc/UTC
-usr/share/zoneinfo/Etc/GMT
-usr/share/zoneinfo/Etc/GMT0
-usr/share/zoneinfo/Etc/GMT+0
-usr/share/zoneinfo/Etc/GMT+1
-usr/share/zoneinfo/Etc/GMT+2
-usr/share/zoneinfo/Etc/GMT+3
-usr/share/zoneinfo/Etc/GMT+4
-usr/share/zoneinfo/Etc/GMT+5
-usr/share/zoneinfo/Etc/GMT+6
-usr/share/zoneinfo/Etc/GMT+7
-usr/share/zoneinfo/Etc/GMT+8
-usr/share/zoneinfo/Etc/GMT+9
-usr/share/zoneinfo/Etc/GMT+10
-usr/share/zoneinfo/Etc/GMT+11
-usr/share/zoneinfo/Etc/GMT+12
-usr/share/zoneinfo/Etc/GMT-0
-usr/share/zoneinfo/Etc/GMT-1
-usr/share/zoneinfo/Etc/GMT-2
-usr/share/zoneinfo/Etc/GMT-3
-usr/share/zoneinfo/Etc/GMT-4
-usr/share/zoneinfo/Etc/GMT-5
-usr/share/zoneinfo/Etc/GMT-6
-usr/share/zoneinfo/Etc/GMT-7
-usr/share/zoneinfo/Etc/GMT-8
-usr/share/zoneinfo/Etc/GMT-9
-usr/share/zoneinfo/Etc/GMT-10
-usr/share/zoneinfo/Etc/GMT-11
-usr/share/zoneinfo/Etc/GMT-12
-usr/share/zoneinfo/Etc/GMT-13
-usr/share/zoneinfo/Etc/GMT-14
-usr/share/zoneinfo/Europe/Sofia
-usr/share/zoneinfo/CET
-usr/share/zoneinfo/EET
-usr/share/zoneinfo/EST
-usr/share/zoneinfo/HST
-usr/share/zoneinfo/MET
-usr/share/zoneinfo/MST
-usr/share/zoneinfo/WET
-usr/share/zoneinfo/CST6CDT
-usr/share/zoneinfo/EST5EDT
-usr/share/zoneinfo/MST7MDT
-usr/share/zoneinfo/PST8PDT
-
-
-###########
-
-# contents of /boot
-boot/boot
-boot/boot0
-boot/boot0sio
-boot/boot1
-boot/boot2
-boot/cdboot
-boot/defaults/loader.conf
-boot/device.hints
-boot/gptboot
-boot/gptzfsboot
-boot/loader
-boot/loader.4th
-boot/loader.help
-boot/loader.rc
-boot/mbr
-boot/pmbr
-boot/pxeboot
-boot/support.4th
-boot/zfsboot
-boot/zfsloader
-
 # contents of /bin
-bin/[:bin/test
 bin/cat
 bin/chflags
-bin/chio
 bin/chmod
 bin/cp
 bin/csh:bin/tcsh
 bin/date
 bin/dd
 bin/df
-bin/domainname
 bin/echo
-bin/ed:bin/red
 bin/expr
-bin/getfacl
 bin/hostname
 bin/kenv
 bin/kill
-bin/link:bin/ln
+bin/ln:bin/link
 bin/ls
 bin/mkdir
 bin/mv
@@ -460,106 +34,23 @@ bin/pwait
 bin/pwd
 bin/realpath
 bin/rm:bin/unlink
-bin/rmdir
-bin/setfacl
 bin/sh
 bin/sleep
 bin/stty
 bin/sync
+bin/test:bin/[
 bin/uuidgen
 
-# contents of /sbin
-sbin/adjkerntz
-sbin/atacontrol
-sbin/badsect
-sbin/bsdlabel:sbin/disklabel
-sbin/camcontrol
-sbin/ccdconfig
-sbin/comcontrol
-sbin/conscontrol
-sbin/devd
-sbin/devfs
-sbin/dhclient
-sbin/dhclient-script
-sbin/dmesg
-sbin/dump:sbin/rdump
-sbin/dumpfs
-sbin/dumpon
-sbin/fastboot:sbin/fasthalt:sbin/halt:sbin/reboot
-sbin/fdisk
-sbin/ffsinfo
-sbin/fsck
-sbin/fsck_ufs:sbin/fsck_ffs:sbin/fsck_4.2bsd
-sbin/fsck_msdosfs
-sbin/gbde
-sbin/ggatec
-sbin/ggated
-sbin/ggatel
-sbin/geom:sbin/gcache:sbin/gconcat:sbin/geli:sbin/gjournal:sbin/glabel:sbin/gmirror:sbin/gmountver:sbin/gmultipath:sbin/gnop:sbin/gpart:sbin/graid3:sbin/gsched:sbin/gshsec:sbin/gstripe:sbin/gvirstor
-sbin/growfs
-sbin/hastctl
-sbin/hastd
-sbin/ifconfig
-sbin/init
-sbin/ipfw
-sbin/iscontrol
-sbin/kldconfig
-sbin/kldload
-sbin/kldstat
-sbin/kldunload
-sbin/ldconfig
-sbin/md5
-sbin/mdconfig
-sbin/mknod
-sbin/mksnap_ffs
-sbin/mdmfs:sbin/mount_mfs
-sbin/mount
-sbin/mount_cd9660
-sbin/mount_msdosfs
-sbin/mount_nfs:sbin/mount_newnfs
-sbin/mount_ntfs
-sbin/mount_nullfs
-sbin/mount_udf
-sbin/mount_unionfs
-sbin/natd
-sbin/newfs
-sbin/newfs_msdos
-sbin/nextboot
-sbin/nfsiod
-sbin/nologin
-sbin/nos-tun
-sbin/pfctl
-sbin/pflogd
-sbin/ping
-sbin/ping6
-sbin/quotacheck
-sbin/rcorder
-sbin/recoverdisk
-sbin/restore:sbin/rrestore
-sbin/rmd160
-sbin/route
-sbin/rtsol
-sbin/savecore
-sbin/setkey
-sbin/sha1
-sbin/sha256
-sbin/shutdown
-sbin/spppcontrol
-sbin/swapctl:sbin/swapon:sbin/swapoff
-sbin/sysctl
-sbin/tunefs
-sbin/umount
-sbin/zfs
-sbin/zpool
-
 # contents of /usr/bin
-usr/bin/Mail:usr/bin/mail:usr/bin/mailx
+usr/bin/apropos:usr/bin/man:usr/bin/manpath:usr/bin/whatis
 usr/bin/at:usr/bin/atq:usr/bin/atrm:usr/bin/batch
-usr/bin/awk
+usr/bin/awk:usr/bin/nawk
 usr/bin/basename
 usr/bin/bsdcpio:usr/bin/cpio
+usr/bin/bsdgrep:usr/bin/lzegrep:usr/bin/lzfgrep:usr/bin/lzgrep:usr/bin/xzegrep:usr/bin/xzfgrep:usr/bin/xzgrep
 usr/bin/bsdiff
 usr/bin/bsdtar:usr/bin/tar
+usr/bin/bsnmpget:usr/bin/bsnmpset:usr/bin/bsnmpwalk
 usr/bin/bspatch
 usr/bin/bthost
 usr/bin/btsockstat
@@ -567,117 +58,89 @@ usr/bin/bunzip2:usr/bin/bzcat:usr/bin/bzip2
 usr/bin/bzip2recover
 usr/bin/cap_mkdb
 usr/bin/chat
-usr/bin/chfn:usr/bin/chpass:usr/bin/chsh
 usr/bin/chgrp
-usr/bin/cksum:usr/bin/sum
-usr/bin/clear
-usr/bin/cmp
-usr/bin/comm
 usr/bin/compress:usr/bin/uncompress
 usr/bin/cpuset
 usr/bin/crontab
-usr/bin/csplit
 usr/bin/cu:usr/bin/tip
 usr/bin/cut
-usr/bin/cvs
 usr/bin/dialog
 usr/bin/diff
-usr/bin/diff3
-usr/bin/dig
 usr/bin/dirname
 usr/bin/du
-usr/bin/ee:usr/bin/edit:usr/bin/ree
-usr/bin/egrep:usr/bin/fgrep:usr/bin/grep
+usr/bin/egrep:usr/bin/fgrep:usr/bin/grep:usr/bin/bzegrep:usr/bin/bzfgrep:usr/bin/bzgrep:usr/bin/zegrep:usr/bin/zfgrep:usr/bin/zgrep
 usr/bin/env
 usr/bin/false
 usr/bin/fetch
-usr/bin/file
 usr/bin/find
-usr/bin/finger
 usr/bin/fstat
 usr/bin/fsync
 usr/bin/ftp
-usr/bin/gcore
-usr/bin/gdb
 usr/bin/gdbserver
 usr/bin/getopt
-usr/bin/gunzip:usr/bin/gzcat:usr/bin/gzip
+usr/bin/gunzip:usr/bin/gzcat:usr/bin/gzip:usr/bin/zcat
 usr/bin/gzexe
 usr/bin/head
-usr/bin/hexdump:usr/bin/hd
 usr/bin/host
-usr/bin/id:usr/bin/whoami
-usr/bin/ident
+usr/bin/id:usr/bin/whoami:usr/bin/groups
 usr/bin/install
 usr/bin/ipcrm
 usr/bin/ipcs
-usr/bin/join
-usr/bin/jot
 usr/bin/killall
-usr/bin/ktrace
 usr/bin/last
 usr/bin/lastcomm
 usr/bin/ldd
 usr/bin/less:usr/bin/more
 usr/bin/lesspipe.sh
 usr/bin/limits
-usr/bin/lock
 usr/bin/lockf
 usr/bin/logger
 usr/bin/login
 usr/bin/logins
-usr/bin/logname
-usr/bin/look
 usr/bin/lp
 usr/bin/lpq
 usr/bin/lpr
 usr/bin/lprm
 usr/bin/lsvfs
-usr/bin/man
-usr/bin/merge
-usr/bin/mesg
+usr/bin/lzcat:usr/bin/lzma:usr/bin/unlzma:usr/bin/unxz:usr/bin/xz:usr/bin/xzcat
+usr/bin/lzdec:usr/bin/xzdec
+usr/bin/lzmainfo
 usr/bin/minigzip
-usr/bin/ministat
 usr/bin/mkfifo
 usr/bin/mktemp
 usr/bin/mkuzip
-usr/bin/msgs
 usr/bin/mt
 usr/bin/nc
 usr/bin/netstat
 usr/bin/newgrp
 usr/bin/nfsstat
 usr/bin/nice
-usr/bin/nm
 usr/bin/nohup
+#usr/bin/ntpq
 usr/bin/nslookup
+usr/bin/nsupdate
 usr/bin/openssl
 usr/bin/opieinfo
 usr/bin/opiekey:usr/bin/otp-md4:usr/bin/otp-md5:usr/bin/otp-sha
 usr/bin/opiepasswd
 usr/bin/passwd
-usr/bin/paste
 usr/bin/patch
 usr/bin/pawd
-usr/bin/perror
-usr/bin/pkill
 usr/bin/printenv
 usr/bin/printf
-usr/bin/procstat
 usr/bin/quota
+usr/bin/rctl
 usr/bin/renice
 usr/bin/reset:usr/bin/tset
 usr/bin/revoke
 usr/bin/rfcomm_sppd
 usr/bin/rpcinfo
-usr/bin/rs
 usr/bin/rup
 usr/bin/ruptime
 usr/bin/rusers
 usr/bin/rwall
 usr/bin/rwho
 usr/bin/scp
-usr/bin/script
 usr/bin/sed
 usr/bin/seq
 usr/bin/sftp
@@ -693,7 +156,6 @@ usr/bin/ssh-agent
 usr/bin/ssh-keygen
 usr/bin/ssh-keyscan
 usr/bin/stat:usr/bin/readlink
-usr/bin/strings
 usr/bin/su
 usr/bin/systat
 usr/bin/tail
@@ -718,7 +180,7 @@ usr/bin/usbhidctl
 usr/bin/users
 usr/bin/uudecode:usr/bin/b64decode
 usr/bin/uuencode:usr/bin/b64encode
-usr/bin/vi:usr/bin/view
+usr/bin/vi:usr/bin/view:usr/bin/nex:usr/bin/nvi:usr/bin/nview
 usr/bin/vmstat
 usr/bin/wall
 usr/bin/wc
@@ -732,7 +194,6 @@ usr/bin/yes
 usr/sbin/ac
 usr/sbin/accton
 usr/sbin/acpiconf
-usr/sbin/acpidump
 usr/sbin/adduser
 usr/sbin/amd
 usr/sbin/amq
@@ -740,6 +201,7 @@ usr/sbin/ancontrol
 usr/sbin/apm
 usr/sbin/apmd
 usr/sbin/arp
+usr/sbin/ath3kfw
 usr/sbin/authpf
 usr/sbin/bcmfw
 usr/sbin/boot0cfg
@@ -760,18 +222,16 @@ usr/sbin/chroot
 usr/sbin/clear_locks
 usr/sbin/cpucontrol
 usr/sbin/cron
-usr/sbin/daemon
 usr/sbin/devinfo
 usr/sbin/digictl
 usr/sbin/diskinfo
-usr/sbin/dumpcis
 usr/sbin/edquota
 usr/sbin/extattrctl
 usr/sbin/faithd
-usr/sbin/fdcontrol
-usr/sbin/fdformat
-usr/sbin/fdread
-usr/sbin/fdwrite
+#usr/sbin/fdcontrol
+#usr/sbin/fdformat
+#usr/sbin/fdread
+#usr/sbin/fdwrite
 usr/sbin/fifolog_create
 usr/sbin/fifolog_reader
 usr/sbin/fifolog_writer
@@ -781,8 +241,7 @@ usr/sbin/fsinfo
 usr/sbin/ftp-proxy
 usr/sbin/fwcontrol
 usr/sbin/getextattr:usr/sbin/lsextattr:usr/sbin/rmextattr:usr/sbin/setextattr
-usr/sbin/getfmac
-usr/sbin/getpmac
+usr/sbin/gpioctl
 usr/sbin/gstat
 usr/sbin/hccontrol
 usr/sbin/hcsecd
@@ -800,8 +259,6 @@ usr/sbin/ipfwpcap
 usr/sbin/jail
 usr/sbin/jexec
 usr/sbin/jls
-usr/sbin/kbdcontrol
-usr/sbin/kbdmap:usr/sbin/vidfont
 usr/sbin/kldxref
 usr/sbin/l2control
 usr/sbin/l2ping
@@ -818,14 +275,12 @@ usr/sbin/mixer
 usr/sbin/mk-amd-map
 usr/sbin/mld6query
 usr/sbin/mlxcontrol
-usr/sbin/mount_nwfs
-usr/sbin/mount_portalfs
 usr/sbin/mount_smbfs
 usr/sbin/mountd
-usr/sbin/mptable
+#usr/sbin/mptable
 usr/sbin/mptutil
 usr/sbin/mtree
-usr/sbin/named
+usr/sbin/named:usr/sbin/lwresd
 usr/sbin/ndis_events
 usr/sbin/ndiscvt
 usr/sbin/ndisgen
@@ -840,23 +295,25 @@ usr/sbin/ngctl
 usr/sbin/nghook
 usr/sbin/nologin
 usr/sbin/nscd
+#usr/sbin/ntp-keygen
+#usr/sbin/ntpd
+#usr/sbin/ntpdc
 usr/sbin/ntpdate
-usr/sbin/pac
+#usr/sbin/ntptime
 usr/sbin/pciconf
-usr/sbin/periodic
-usr/sbin/pkg_add
-usr/sbin/pkg_create
-usr/sbin/pkg_delete
-usr/sbin/pkg_info
-usr/sbin/pkg_updating
-usr/sbin/pkg_version
-usr/sbin/pmcannotate
+#usr/sbin/pkg_add
+#usr/sbin/pkg_create
+#usr/sbin/pkg_delete
+#usr/sbin/pkg_info
+#usr/sbin/pkg_updating
+#usr/sbin/pkg_version
 usr/sbin/pmccontrol
 usr/sbin/pmcstat
 usr/sbin/pnpinfo
 usr/sbin/powerd
 usr/sbin/ppp
 usr/sbin/pppctl
+usr/sbin/procctl
 usr/sbin/pstat:usr/sbin/swapinfo
 usr/sbin/pw
 usr/sbin/pwd_mkdb
@@ -872,17 +329,15 @@ usr/sbin/rpc.statd
 usr/sbin/rpc.umntall
 usr/sbin/rpcbind
 usr/sbin/rrenumd
+usr/sbin/rtadvctl
 usr/sbin/rtadvd
 usr/sbin/rtsold
 usr/sbin/rwhod
 usr/sbin/sa
 usr/sbin/sdpcontrol
 usr/sbin/sdpd
+usr/sbin/services_mkdb
 usr/sbin/setfib
-usr/sbin/setfmac
-usr/sbin/setfsmac
-usr/sbin/setpmac
-usr/sbin/sicontrol
 usr/sbin/smbmsg
 usr/sbin/snapinfo
 usr/sbin/spkrtest
@@ -895,12 +350,11 @@ usr/sbin/tcpdrop
 usr/sbin/tcpdump
 usr/sbin/traceroute
 usr/sbin/traceroute6
-usr/sbin/trpt
 usr/sbin/uathload
 usr/sbin/ugidfw
 usr/sbin/uhsoctl
 usr/sbin/usbconfig
-usr/sbin/vidcontrol
+usr/sbin/usbdump
 usr/sbin/vipw
 usr/sbin/wake
 usr/sbin/watch
@@ -911,25 +365,26 @@ usr/sbin/wlconfig
 usr/sbin/wpa_cli
 usr/sbin/wpa_passphrase
 usr/sbin/wpa_supplicant
+usr/sbin/zdb
 usr/sbin/zzz
 
 # contents of /usr/libexec
 usr/libexec/atrun
 usr/libexec/bootpd
 usr/libexec/bootpgw
-usr/libexec/fingerd
-usr/libexec/ftpd
 usr/libexec/getty
 usr/libexec/pppoed
 usr/libexec/rbootd
-usr/libexec/revnetgroup
+#usr/libexec/revnetgroup
 usr/libexec/rpc.rquotad
 usr/libexec/rpc.rstatd
 usr/libexec/rpc.rusersd
 usr/libexec/rpc.rwalld
 usr/libexec/rpc.sprayd
+usr/libexec/save-entropy
 usr/libexec/sftp-server
 usr/libexec/ssh-keysign
+usr/libexec/ssh-pkcs11-helper
 usr/libexec/tcpd
 usr/libexec/telnetd
 usr/libexec/tftp-proxy
@@ -980,31 +435,3 @@ usr/share/zoneinfo/CST6CDT
 usr/share/zoneinfo/EST5EDT
 usr/share/zoneinfo/MST7MDT
 usr/share/zoneinfo/PST8PDT
-
-
-# special content of lib directory for GEOM
-lib/geom/geom_cache.so
-lib/geom/geom_concat.so
-lib/geom/geom_eli.so
-lib/geom/geom_journal.so
-lib/geom/geom_label.so
-lib/geom/geom_mirror.so
-lib/geom/geom_mountver.so
-lib/geom/geom_multipath.so
-lib/geom/geom_nop.so
-lib/geom/geom_part.so
-lib/geom/geom_raid3.so
-lib/geom/geom_sched.so
-lib/geom/geom_shsec.so
-lib/geom/geom_stripe.so
-lib/geom/geom_virstor.so
-
-# additional not depend libraries for AITBSD
-lib/libalias_cuseeme.so
-lib/libalias_dummy.so
-lib/libalias_ftp.so
-lib/libalias_irc.so
-lib/libalias_nbt.so
-lib/libalias_pptp.so
-lib/libalias_skinny.so
-lib/libalias_smedia.so