--- elwix/config/rc.subr	2014/01/05 23:14:23	1.8
+++ 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.8 2014/01/05 23:14:23 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 -
 }
@@ -116,8 +126,14 @@ MakeFS_etc()
 
 	chown -R root:wheel $1/etc;
 
-	chmod 0600 $1/etc/opieaccess;
-	chmod 0600 $1/etc/opiekeys;
+	case "$3" in
+		uboot)
+			;;
+		*)
+#			chmod 0600 $1/etc/opieaccess;
+#			chmod 0600 $1/etc/opiekeys;
+			;;
+	esac
 
 	chmod 0600 $1/etc/master.passwd;
 	chmod 0600 $1/etc/spwd.db;
@@ -125,11 +141,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;
@@ -142,7 +159,7 @@ MakeFS_etc()
 
 	ln -sf /var/run/resolv.conf $1/etc/resolv.conf;
 
-	ln -sf /elwix/pkg/etc/mk.conf $1/etc/mk.conf;
+#	ln -sf /elwix/pkg/etc/mk.conf $1/etc/mk.conf;
 
 	echo ${TARGET_ARCH} >$1/etc/platform;
 
@@ -166,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()
 {
@@ -186,18 +190,20 @@ MakeFS_boot()
 
 	install -m 644 ${CFGDIR}/boot/boot.config $1;
 
-	install -m 444 ${CFGDIR}/boot/beastie.4th $1/boot;
-	install -m 444 ${CFGDIR}/boot/brand.4th $1/boot;
-	install -m 444 ${CFGDIR}/boot/menu.4th $1/boot;
+	case ${TARGET} in
+		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;
+			;;
+		*)
+			;;
+	esac
 
 	install -m 444 ${KERNDEVHINTS} $1/boot/device.hints;
 
 	if [ -r ${CFGDIR}/boot/loader_${TARGET_ARCH}.conf ]; then
 		install -m 644 ${CFGDIR}/boot/loader_${TARGET_ARCH}.conf $1/boot/loader.conf;
-	else
-		echo;
-		echo "Can't find right loader.conf for TARGET_ARCH=${TARGET_ARCH} ... loader.conf not installed!";
-		echo;
 	fi;
 }
 
@@ -217,7 +223,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 -
@@ -253,6 +260,26 @@ InstallFiles()
 	fi
 }
 
+# $1 = From dir
+# $2 = To dir
+InstallLibs()
+{
+	${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
 CleanCVS()
 {
@@ -276,7 +303,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 -