--- elwix/config/rc.subr	2012/05/29 14:24:05	1.2.4.2
+++ elwix/config/rc.subr	2013/07/31 16:05:36	1.6.2.2
@@ -4,7 +4,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: rc.subr,v 1.2.4.2 2012/05/29 14:24:05 misho Exp $
+# $Id: rc.subr,v 1.6.2.2 2013/07/31 16:05:36 misho Exp $
 #
 
 ### Dont edit this file !!!
@@ -35,13 +35,146 @@ SnitVer()
 	return 0
 }
 
+Create_etc_motd()
+{
+	ELWIX_VER="ELWIX-${VERSION}_$2_${TARGET_ARCH}";
+	ELWIX_HDR_MOTD="${ELWIX_VER} :: Build date ${BUILD_DATE}";
+
+	awk -v fo="${1:-motd}" 'BEGIN { print "'"${ELWIX_HDR_MOTD}"'" > fo; } { print $0 >> fo; }' \
+		   ${CFGDIR}/elwix_signature.txt;
+}
+
+# $1 = fs/elwix
+# $2 = config/etc/default
+MakeFS_var()
+{
+	cd $1
+
+	install -d altroot;
+	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 -m 0750 altroot/var/cron;
+	install -d -m 0700 altroot/var/cron/tabs;
+	install -d altroot/var/db;
+	install -d -m 0555 altroot/var/empty;
+	install -d altroot/var/log;
+	install -d -o 101 -g 101 altroot/var/log/quagga;
+	install -d -o 883 -g 883 altroot/var/mqtt;
+	install -d altroot/var/named;
+	install -d altroot/var/run;
+	install -d altroot/var/sys;
+	install -d -o 53 -g 53 altroot/var/run/named;
+	install -d -o 101 -g 101 altroot/var/run/quagga;
+	install -d altroot/var/spool;
+	install -d -o 66 -g 68 -m 0775 altroot/var/spool/lock;
+	install -d -g 1 altroot/var/spool/lpd;
+	install -d -g 1 altroot/var/spool/output;
+	install -d -g 1 altroot/var/spool/output/lpd;
+
+	ln -fs /tmp altroot/var/tmp;
+
+	touch altroot/var/run/utmp
+
+	touch altroot/var/account/acct
+
+	touch altroot/var/log/elwix
+	touch altroot/var/log/lastlog
+	touch altroot/var/log/wifi.log
+	touch altroot/var/log/utx.log
+
+	touch altroot/var/log/auth.log
+	touch altroot/var/log/cron
+	touch altroot/var/log/console.log
+	touch altroot/var/log/debug.log
+	touch altroot/var/log/init.log
+	touch altroot/var/log/lpd-errs
+	touch altroot/var/log/maillog
+	touch altroot/var/log/messages
+	touch altroot/var/log/security
+	touch altroot/var/log/xferlog
+	touch altroot/var/log/ppp.log
+	chgrp 69 altroot/var/log/ppp.log
+
+	InstallDir ${WORLD}/var/named $1/altroot/var/named
+	InstallList ${ELWIX_BSDSRC} ${BSDSRC} $1/altroot/var/named
+	install -v $2/resolv.safe altroot/var/run/resolv.conf
+
+	chown -hR root:wheel .
+	cd -
+}
+
+# $1 = fs/elwix
+# $2 = config/etc/default
+# $3 = name
+MakeFS_etc()
+{
+	InstallDir $2 $1/etc
+
+	chown -R root:wheel $1/etc;
+
+	chmod 0600 $1/etc/opieaccess;
+	chmod 0600 $1/etc/opiekeys;
+
+	chmod 0600 $1/etc/master.passwd;
+	chmod 0600 $1/etc/spwd.db;
+	chmod 0600 $1/etc/ssh/ssh_host_dsa_key;
+	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 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;
+
+	ln -sf /etc/rc.s $1/etc/rc.S
+
+	ln -sf /usr/share/zoneinfo/${TIMEZONE} $1/etc/localtime;
+	ln -sf /usr/share/misc/termcap $1/etc/termcap;
+
+	ln -sf /var/named/etc/namedb $1/etc/namedb;
+	ln -sf /var/run/resolv.conf $1/etc/resolv.conf;
+
+	ln -sf /elwix/pkg/etc/mk.conf $1/etc/mk.conf;
+
+	echo ${TARGET_ARCH} >$1/etc/platform;
+
+	Create_etc_motd $1/etc/motd $3;
+
+	CleanCVS $1
+	CleanCVS $1/etc
+}
+
 # $1 = ELWIX install list config
 # $2 = From World dir
 # $3 = To Dest dir
 InstallList()
 {
-	sed -nE -e 's/^ *([^ #]+) */\1/p' < $1 | tr ':' '\n' | 
-		tar -C $2 -cvf - -T - | tar -C $3 -x -f -
+	local TMPFILE=$(mktemp -q /tmp/instlist.XXXXXX)
+	if [ $? -ne 0 ]; then
+		echo "Error:: Can't create temp file, exiting..."
+		exit 1
+	fi
+
+	sed -nE -e 's/^ *([^ #]+) */\1/p' < $1 | tr ':' '\n' >$TMPFILE
+	cd $2
+	for i in $(cat $TMPFILE); do
+		if [ -x $i ]; then
+			echo "Strip '$i'"
+			strip -s $i
+		fi
+	done
+	cd -
+	tar -C $2 -cvf - -T $TMPFILE | tar -C $3 -x -f -
+	rm -f $TMPFILE
 }
 
 # $1 = From dir
@@ -79,3 +212,26 @@ CleanCVS()
 	find $1 -type f -name .#\* -exec rm -f {} \; >/dev/null 2>&1
 }
 
+# $1 = file_pattern
+# $2 = From dir
+StripFiles()
+{
+	if [ -d "$2" ]; then
+		local TMPFILE=$(mktemp -q /tmp/instlist.XXXXXX)
+		if [ $? -ne 0 ]; then
+			echo "Error:: Can't create temp file, exiting..."
+			exit 1
+		fi
+
+		cd $2
+		find . -type f -name "$1" >$TMPFILE
+		for i in $(cat $TMPFILE); do
+			if [ -x $i ]; then
+				echo "Strip '$i'"
+				strip -s $i
+			fi
+		done
+		cd -
+		rm -f $TMPFILE
+	fi
+}