--- elwix/build_uboot.sh	2014/01/21 09:21:55	1.1.2.3
+++ elwix/build_uboot.sh	2014/01/23 08:20:11	1.1.2.7
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_uboot.sh,v 1.1.2.3 2014/01/21 09:21:55 misho Exp $
+# $Id: build_uboot.sh,v 1.1.2.7 2014/01/23 08:20:11 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -75,6 +75,7 @@ build_ubfs()
 	ln -fs /usr/lib lib;
 	install -d usr/lib/engines;
 	install -d usr/lib/geom;
+	install -d usr/libdata;
 	install -d usr/libexec;
 	ln -fs /usr/libexec libexec;
 	install -d usr/local;
@@ -124,19 +125,9 @@ install_ubfs()
 
 	find ${WORLD}/libexec -type f -name ld-elf.so\* -exec install {} $LIBEXEC \;
 
-#	find ${WORLD}/lib -type f -name \*.so.\* -exec install {} $LIBS \;
-#	find ${WORLD}/lib -type f -name libalias_\*.so -exec install {} $LIBS \;
-#	find ${WORLD}/lib/geom -type f -name \*.so -exec install {} $LIBS/geom \;
-#	find ${WORLD}/usr/lib -type f -name \*.so.\* -exec install {} $LIBS \;
-#	find ${WORLD}/usr/lib/engines -type f -name \*.so -exec install {} $LIBS/engines \;
-
 	InstallList ${ELWIX_UBFS} ${WORLD} ${UBFS}
+	InstallLibs ${WORLD} ${UBFS}
 
-	InstallDir ${WORLD}/usr/local/bin $UBIN
-	InstallDir ${WORLD}/usr/local/sbin $USBIN
-	InstallFiles \*.so\* ${WORLD}/usr/local/lib $LIBS
-	InstallDir ${WORLD}/usr/local/libdata $LIBDATA
-
 	chown -R root:wheel $SBIN $BIN $USBIN $UBIN $LIBDATA $LIBEXEC $LIBS
 }
 
@@ -157,9 +148,10 @@ create_etc_fstab()
 	cat >$1/etc/fstab <<_EOF
 # Automatic generated fstab for ELWIX $2 at ${BUILD_DATE}
 #
-/dev/map/rootfs		/	ufs	ro			0	0
-md0			/tmp	mfs	rw,-s8m,-oasync,-S	0	0
-md1			/var	mfs	rw,-s16m,-S		0       0
+/dev/map/rootfs.uncompress	/	ufs	ro			0	0
+/dev/map/NVRAM		/etc	ufs	ro			0	1
+md0				/tmp	mfs	rw,-s8m,-oasync,-S	0	0
+md1				/var	mfs	rw,-s16m,-S		0       0
 _EOF
 }
 
@@ -188,9 +180,9 @@ install_ubfs
 prepare_fs ${UBOOT_FS}
 MakeFS_home ${UBOOT_FS}/elwix
 MakeFS_var ${UBOOT_FS}/elwix ${UBOOT_ETC}
-MakeFS_etc ${UBOOT_FS}/elwix ${UBOOT_ETC} uboot
-create_etc_fstab ${UBOOT_FS}/elwix uboot
-MakeFS_backup ${UBOOT_FS}/elwix
+MakeFS_etc ${UBFS}/elwix ${UBOOT_ETC} uboot
+create_etc_fstab ${UBFS}/elwix uboot
+MakeFS_backup ${UBFS}/elwix
 #install_fs ${UBOOT_FS}
 
 echo "+++ Complete build ELWIX u-boot"