--- elwix/config/rc.subr	2014/09/17 20:53:37	1.9.2.1
+++ elwix/config/rc.subr	2017/06/19 21:12:57	1.10.2.6
@@ -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.1 2014/09/17 20:53:37 misho Exp $
+# $Id: rc.subr,v 1.10.2.6 2017/06/19 21:12:57 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;
@@ -103,6 +112,7 @@ MakeFS_var()
 	chgrp 69 altroot/var/log/ppp.log
 
 	install -v $2/resolv.safe altroot/var/run/resolv.conf
+	install -v ${WORLD}/usr/share/keys/pkg/trusted/* altroot/pkg/keys/trusted
 
 	cd -
 }
@@ -120,8 +130,8 @@ MakeFS_etc()
 		uboot)
 			;;
 		*)
-			chmod 0600 $1/etc/opieaccess;
-			chmod 0600 $1/etc/opiekeys;
+#			chmod 0600 $1/etc/opieaccess;
+#			chmod 0600 $1/etc/opiekeys;
 			;;
 	esac
 
@@ -173,19 +183,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,9 +191,9 @@ MakeFS_boot()
 	install -m 644 ${CFGDIR}/boot/boot.config $1;
 
 	case ${TARGET} in
-		i386)
-			install -m 444 ${CFGDIR}/boot/beastie.4th $1/boot;
-			install -m 444 ${CFGDIR}/boot/brand.4th $1/boot;
+		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;
 			;;
 		*)