--- elwix/config/rc.subr	2014/01/30 08:46:41	1.8.2.7
+++ elwix/config/rc.subr	2017/06/14 23:16:12	1.10.2.3
@@ -4,7 +4,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: rc.subr,v 1.8.2.7 2014/01/30 08:46:41 misho Exp $
+# $Id: rc.subr,v 1.10.2.3 2017/06/14 23:16:12 misho Exp $
 #
 
 ### Dont edit this file !!!
@@ -51,6 +51,13 @@ 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;
@@ -60,6 +67,9 @@ MakeFS_var()
 	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/etc;
+	install -d altroot/var/db/keys;
+	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 +113,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 +131,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
 
@@ -131,6 +142,7 @@ MakeFS_etc()
 	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 0600 $1/etc/ssh/ssh_host_ed25519_key;
 
 	chmod 0440 $1/etc/sudoers;
 
@@ -193,9 +205,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;
 			;;
 		*)
@@ -225,6 +237,7 @@ InstallList()
 	for i in $(cat $TMPFILE); do
 		if [ -x $i ]; then
 			echo "Strip '$i'"
+			${CEXEC} chflags -f noschg $i
 			${CEXEC} strip -s $i
 		fi
 	done
@@ -304,6 +317,7 @@ StripFiles()
 		for i in $(cat $TMPFILE); do
 			if [ -x $i ]; then
 				echo "Strip '$i'"
+				${CEXEC} chflags -f noschg $i
 				${CEXEC} strip -s $i
 			fi
 		done