--- elwix/config/rc.subr	2014/01/21 16:33:40	1.8.2.3
+++ elwix/config/rc.subr	2017/06/12 08:47:24	1.10.2.1
@@ -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.3 2014/01/21 16:33:40 misho Exp $
+# $Id: rc.subr,v 1.10.2.1 2017/06/12 08:47:24 misho Exp $
 #
 
 ### Dont edit this file !!!
@@ -66,6 +66,10 @@ MakeFS_var()
 	install -d -o 101 -g 101 altroot/var/log/quagga;
 	install -d -o 883 -g 883 altroot/var/mqtt;
 	install -d altroot/var/frm;
+	install -d altroot/var/pkg;
+	install -d altroot/var/pkg/keys;
+	install -d altroot/var/pkg/keys/revoked;
+	install -d altroot/var/pkg/keys/trusted;
 	install -d altroot/var/run;
 	install -d -o 80 -g 80 altroot/var/run/lighttpd;
 	install -d -o 101 -g 101 altroot/var/run/quagga;
@@ -120,8 +124,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,11 +135,12 @@ 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;
 
-	chgrp 80 $1/etc/config.xml;
-	chmod 0660 $1/etc/config.xml;
+#	chgrp 80 $1/etc/config.xml;
+#	chmod 0660 $1/etc/config.xml;
 
 	mkdir -p $1/etc/mqtt;
 	chgrp -R 883 $1/etc/mqtt;
@@ -178,7 +183,7 @@ MakeFS_backup()
 	mkdir -p $1/altroot/backup
 
 	cd $1
-	cp -p etc/config.xml altroot/backup
+#	cp -p etc/config.xml altroot/backup
 	tar -czf altroot/backup/.etc.tgz etc
 
 	cd altroot
@@ -193,9 +198,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,7 +230,8 @@ InstallList()
 	for i in $(cat $TMPFILE); do
 		if [ -x $i ]; then
 			echo "Strip '$i'"
-			strip -s $i
+			${CEXEC} chflags -f noschg $i
+			${CEXEC} strip -s $i
 		fi
 	done
 	cd -
@@ -265,10 +271,20 @@ InstallFiles()
 # $2 = To dir
 InstallLibs()
 {
-	${CEXEC} find -X $2 ! -name "*.ko" -and -type f -and -perm +111 | \
-		xargs ldd -f "%p\n" 2> /dev/null | sort | uniq | \
-		sed 's|^/||' >${DEST}/elwix_mklibs.conf
-	InstallList ${DEST}/elwix_mklibs.conf $1 $2
+	${CEXEC} find -X $2 ! -name "*.ko" -and -type f | \
+		xargs readelf -d 2>&- | grep "NEEDED" | sort | uniq | \
+		awk '($2 == "(NEEDED)") { print substr($5, 2, length($5) - 2); }' \
+		2>/dev/null >${DEST}/elwix_mklibs.tmp
+	for i in $(cat ${DEST}/elwix_mklibs.tmp); do
+		echo $i
+		${CEXEC} find $1 -type f -name $i -exec install -v {} $LIBS \\\;
+		${CEXEC} chflags -f noschg $LIBS/$i
+		${CEXEC} strip -s $LIBS/$i
+	done
+#	${CEXEC} find -X $2 ! -name "*.ko" -and -type f -and -perm +111 | \
+#		xargs ldd -f "%p\n" 2> /dev/null | sort | uniq | \
+#		sed 's|^/||' >${DEST}/elwix_mklibs.conf
+#	InstallList ${DEST}/elwix_mklibs.conf $1 $2
 }
 
 # $1 = Directory for clean
@@ -294,7 +310,8 @@ StripFiles()
 		for i in $(cat $TMPFILE); do
 			if [ -x $i ]; then
 				echo "Strip '$i'"
-				strip -s $i
+				${CEXEC} chflags -f noschg $i
+				${CEXEC} strip -s $i
 			fi
 		done
 		cd -