--- elwix/config/rc.subr	2013/07/31 15:53:43	1.6.2.1
+++ elwix/config/rc.subr	2013/10/14 15:08:12	1.7.4.2
@@ -4,7 +4,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: rc.subr,v 1.6.2.1 2013/07/31 15:53:43 misho Exp $
+# $Id: rc.subr,v 1.7.4.2 2013/10/14 15:08:12 misho Exp $
 #
 
 ### Dont edit this file !!!
@@ -35,6 +35,15 @@ 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()
@@ -53,12 +62,11 @@ MakeFS_var()
 	install -d altroot/var/db;
 	install -d -m 0555 altroot/var/empty;
 	install -d altroot/var/log;
+	install -d -o 80 -g 80 -m 0700 altroot/var/log/lighttpd;
 	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 altroot/var/frm;
 	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;
@@ -90,12 +98,104 @@ MakeFS_var()
 	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/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 = fs/elwix
+MakeFS_home()
+{
+	install -d $1/root/.ssh
+	[ -r ${CFGDIR}/root.skel/ssh/authorized_keys2 ] && \
+		install -v ${CFGDIR}/root.skel/ssh/authorized_keys2 $1/root/.ssh;
+
+	install -v ${CFGDIR}/root.skel/cshrc $1/root/.cshrc;
+	install -v ${CFGDIR}/root.skel/login $1/root/.login;
+	install -v ${CFGDIR}/root.skel/logout $1/root/.logout;
+	install -v ${CFGDIR}/root.skel/profile $1/root/.profile;
+	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()
+{
+	InstallDir ${WORLD}/boot $1/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;
+
+	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;
 }
 
 # $1 = ELWIX install list config