--- elwix/config/rc.subr	2016/11/23 14:32:45	1.9.2.3
+++ elwix/config/rc.subr	2017/06/28 08:58:51	1.10.2.8
@@ -4,7 +4,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: rc.subr,v 1.9.2.3 2016/11/23 14:32:45 misho Exp $
+# $Id: rc.subr,v 1.10.2.8 2017/06/28 08:58:51 misho Exp $
 #
 
 ### Dont edit this file !!!
@@ -51,15 +51,24 @@ MakeFS_var()
 	cd $1
 
 	install -d altroot;
+
+	install -d altroot/pkg;
+	install -d altroot/pkg/db;
+	install -d altroot/pkg/keys;
+	install -d altroot/pkg/keys/revoked;
+	install -d altroot/pkg/keys/trusted;
+
 	install -d altroot/var;
 	install -d altroot/var/account;
 	install -d altroot/var/at;
 	install -d altroot/var/at/jobs;
 	install -d altroot/var/at/spool;
 	install -d -g 63 -m 0770 altroot/var/authpf;
+	install -d altroot/var/backups;
 	install -d -m 0750 altroot/var/cron;
 	install -d -m 0700 altroot/var/cron/tabs;
 	install -d altroot/var/db;
+	install -d altroot/var/db/pkg;
 	install -d -m 0555 altroot/var/empty;
 	install -d altroot/var/log;
 	install -d -o 80 -g 80 -m 0700 altroot/var/log/lighttpd;
@@ -102,7 +111,8 @@ MakeFS_var()
 	touch altroot/var/log/ppp.log
 	chgrp 69 altroot/var/log/ppp.log
 
-	install -v $2/resolv.safe altroot/var/run/resolv.conf
+#	install -v $2/resolv.safe altroot/var/run/resolv.conf
+	install -v ${WORLD}/usr/share/keys/pkg/trusted/* altroot/pkg/keys/trusted
 
 	cd -
 }
@@ -135,9 +145,6 @@ MakeFS_etc()
 
 	chmod 0440 $1/etc/sudoers;
 
-#	chgrp 80 $1/etc/config.xml;
-#	chmod 0660 $1/etc/config.xml;
-
 	mkdir -p $1/etc/mqtt;
 	chgrp -R 883 $1/etc/mqtt;
 	chown -R 883 $1/etc/mqtt;
@@ -147,7 +154,7 @@ MakeFS_etc()
 	ln -sf /usr/share/zoneinfo/${TIMEZONE} $1/etc/localtime;
 	ln -sf /usr/share/misc/termcap $1/etc/termcap;
 
-	ln -sf /var/run/resolv.conf $1/etc/resolv.conf;
+#	ln -sf /var/run/resolv.conf $1/etc/resolv.conf;
 
 #	ln -sf /elwix/pkg/etc/mk.conf $1/etc/mk.conf;
 
@@ -173,19 +180,6 @@ MakeFS_home()
 	install -v ${CFGDIR}/root.skel/vimrc $1/root/.vimrc;
 }
 
-# $1 = fs/elwix
-MakeFS_backup()
-{
-	mkdir -p $1/altroot/backup
-
-	cd $1
-#	cp -p etc/config.xml altroot/backup
-	tar -czf altroot/backup/.etc.tgz etc
-
-	cd altroot
-	tar -czf backup/.var.tgz var
-}
-
 # $1 = fs
 MakeFS_boot()
 {
@@ -194,7 +188,7 @@ MakeFS_boot()
 	install -m 644 ${CFGDIR}/boot/boot.config $1;
 
 	case ${TARGET} in
-		i386)
+		i386|amd64)
 			install -m 444 ${CFGDIR}/boot/logo-elwix.4th $1/boot;
 			install -m 444 ${CFGDIR}/boot/brand-elwix.4th $1/boot;
 			install -m 444 ${CFGDIR}/boot/menu.4th $1/boot;
@@ -207,6 +201,7 @@ MakeFS_boot()
 
 	if [ -r ${CFGDIR}/boot/loader_${TARGET_ARCH}.conf ]; then
 		install -m 644 ${CFGDIR}/boot/loader_${TARGET_ARCH}.conf $1/boot/loader.conf;
+		install -m 644 ${CFGDIR}/boot/loader.conf.local $1/boot/loader.conf.local;
 	fi;
 }