--- elwix/build_fs.sh	2011/10/18 09:02:05	1.2
+++ elwix/build_fs.sh	2012/03/20 23:14:16	1.3.2.6
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_fs.sh,v 1.2 2011/10/18 09:02:05 misho Exp $
+# $Id: build_fs.sh,v 1.3.2.6 2012/03/20 23:14:16 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -84,8 +84,10 @@ build_fsdir()
 	install -d home;
 # root
 	install -d -m 0700 root;
-# local
-	install -d local;
+# pkg
+	install -d pkg;
+	install -d pkg/db;
+	install -d pkg/lib;
 # tftpboot
 	install -d tftpboot;
 
@@ -99,10 +101,13 @@ mkboot()
 	InstallDir ${WORLD}/boot $1/boot
 
 	install -m 644 ${CFGDIR}/boot/boot.config $1;
-	install -m 644 ${CFGDIR}/boot/beastie.4th $1/boot;
-	install -m 644 ${CFGDIR}/boot/brand.4th $1/boot;
-	install -m 644 ${CFGDIR}/boot/menu.4th $1/boot;
 
+	install -m 444 ${CFGDIR}/boot/beastie.4th $1/boot;
+	install -m 444 ${CFGDIR}/boot/brand.4th $1/boot;
+	install -m 444 ${CFGDIR}/boot/menu.4th $1/boot;
+
+	install -m 444 ${KERNDEVHINTS} $1/boot/device.hints;
+
 	if [ -r ${CFGDIR}/boot/loader_${TARGET_ARCH}.conf ]; then
 		install -m 644 ${CFGDIR}/boot/loader_${TARGET_ARCH}.conf $1/boot/loader.conf;
 	else
@@ -176,6 +181,7 @@ mketc()
 	chmod 0600 $1/etc/ssh/ssh_host_dsa_key;
 	chmod 0600 $1/etc/ssh/ssh_host_key;
 	chmod 0600 $1/etc/ssh/ssh_host_rsa_key;
+	chmod 0600 $1/etc/ssh/ssh_host_ecdsa_key;
 
 	chmod 0440 $1/etc/sudoers;
 
@@ -190,10 +196,16 @@ mketc()
 	ln -sf /var/named/etc/namedb $1/etc/namedb;
 	ln -sf /var/run/resolv.conf $1/etc/resolv.conf;
 
+	ln -sf /elwix/pkg/etc/mk.conf $1/etc/mk.conf;
+
 	echo ${TARGET_ARCH} >$1/etc/platform;
 
 	create_etc_motd $1/etc/motd;
 	create_etc_fstab $1/etc/fstab;
+
+	echo "+++ ELWIX clean CVS tags ..."
+	CleanCVS ${FS}
+	CleanCVS ${FS}/etc
 }
 
 mkbackup()
@@ -228,20 +240,14 @@ install_fsdir()
 
 	install -v ${REL}/${ROOTFS_KERN} ${FS}/boot/kernel
 
-	install -v ${REL}/${ROMFS_IMG} ${FS}/elwix-firmware-${VERSION}_${TARGET_ARCH}
-	ln -s /elwix/elwix-firmware-${VERSION}_${TARGET_ARCH} ${FS}/${ROMFS_IMG}
+	install -v ${REL}/${ROMFS_IMG} ${FS}/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH}
+	ln ${FS}/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH} ${FS}/altroot/${ROMFS_IMG}
+	ln -s /elwix/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH} ${FS}/${ROMFS_IMG}
 
 	cd $FS
 	tar -czvf ${REL}/${OS} .
 }
 
-cleancvs()
-{
-	echo "+++ ELWIX clean CVS tags ..."
-
-	find $1 -type d -name CVS -exec rm -rf {} \; >/dev/null 2>&1
-}
-
 ### main()
 if [ ! -r ${REL}/${ROOTFS_KERN} -o ! -r ${REL}/${ROMFS_IMG} ]; then
 	echo
@@ -259,7 +265,6 @@ mkboot ${FS}
 mkhome ${FS}
 mkvar ${FS}
 mketc ${FS}
-cleancvs ${FS}
 mkbackup ${FS}
 
 install_fsdir