--- elwix/build_base.sh	2017/06/14 22:42:18	1.4.2.1
+++ elwix/build_base.sh	2017/06/19 21:12:57	1.4.2.8
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_base.sh,v 1.4.2.1 2017/06/14 22:42:18 misho Exp $
+# $Id: build_base.sh,v 1.4.2.8 2017/06/19 21:12:57 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -72,12 +72,8 @@ build_basefs()
 	install -d -m 0750 elwix/root/.ssh;
 	install -d elwix/tftpboot;
 	install -d elwix/pkg;
-	install -d elwix/pkg/bin;
-	install -d elwix/pkg/lib;
-	install -d elwix/pkg/libexec;
-	install -d elwix/pkg/libdata;
-	install -d elwix/pkg/sbin;
-	ln -fs /elwix/etc etc;
+	install -d elwix/local;
+	install -d etc;
 	ln -fs /elwix/exports exports;
 	ln -fs /elwix/home home;
 	ln -fs /elwix/root root;
@@ -92,16 +88,18 @@ build_basefs()
 	ln -fs /usr/lib lib;
 	install -d usr/lib/engines;
 	install -d usr/lib/geom;
-	install -d usr/lib32;
+	case ${TARGET} in
+		amd64)
+			install -d usr/lib32;
+			;;
+		*)
+			;;
+	esac
 	install -d usr/libdata;
 	install -d usr/libexec;
 	ln -fs /usr/libexec libexec;
-	install -d usr/local;
-	install -d usr/local/bin;
-	install -d usr/local/lib;
-	install -d usr/local/libexec;
-	install -d usr/local/libdata;
-	install -d usr/local/sbin;
+	ln -fs /elwix/local usr/local;
+	ln -fs /elwix/pkg usr/pkg;
 	install -d usr/sbin;
 	install -d usr/share;
 	install -d usr/share/misc;
@@ -125,7 +123,6 @@ install_basefs()
 	SHARE="${BASEFS}/usr/share"
 	SKEL="${SHARE}/skel"
 	MISC="${SHARE}/misc"
-	KEYS="${SHARE}/keys"
 
 	echo "+++ Install ELWIX BaseFS software ... $BASEFS"
 	if [ -r ${BSDSRC}/release/picobsd/mfs_tree/etc/termcap ]; then
@@ -142,8 +139,6 @@ install_basefs()
 	install -v ${CFGDIR}/root.skel/profile $SKEL/dot.profile;
 	install -v ${CFGDIR}/root.skel/vimrc $SKEL/dot.vimrc;
 
-	ln -sf /var/db/keys ${KEYS}/pkg
-
 	find ${WORLD}/libexec -type f -name ld-elf.so\* -exec install {} $LIBEXEC \;
 
 	find ${WORLD}/lib -type f -name \*.so.\* ! -name \*.debug -exec install {} $LIBS \;
@@ -184,7 +179,7 @@ create_etc_fstab()
 # Automatic generated fstab for ELWIX $2 at ${BUILD_DATE}
 #
 /dev/ufs/elwix		/	ufs	ro			0	1
-md1			/tmp	mfs	rw,-s8m,-oasync,-S,-n	0	0
+tmpfs			/tmp	tmpfs	rw			0	0
 md2			/var	mfs	rw,-s16m,-S,-n		0       0
 _EOF
 }
@@ -227,10 +222,9 @@ install_basefs
 prepare_fs ${BASE_FS}
 MakeFS_home ${BASE_FS}/elwix
 MakeFS_var ${BASE_FS}/elwix ${BASE_ETC}
-MakeFS_etc ${BASE_FS}/elwix ${BASE_ETC} base
-create_etc_fstab ${BASE_FS}/elwix base
-update_etc_cfexec ${BASE_FS}/elwix
-MakeFS_backup ${BASE_FS}/elwix
+MakeFS_etc ${BASE_FS} ${BASE_ETC} base
+create_etc_fstab ${BASE_FS} base
+update_etc_cfexec ${BASE_FS}
 MakeFS_boot ${BASE_FS}
 install_fs ${BASE_FS}