--- elwix/config/rc.subr	2013/08/05 13:10:16	1.7
+++ elwix/config/rc.subr	2014/01/21 09:25:41	1.8.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.7 2013/08/05 13:10:16 misho Exp $
+# $Id: rc.subr,v 1.8.2.2 2014/01/21 09:25:41 misho Exp $
 #
 
 ### Dont edit this file !!!
@@ -62,18 +62,21 @@ 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/frm;
-	install -d -o 53 -g 53 altroot/var/run/named;
+	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;
 	install -d altroot/var/spool;
 	install -d -o 66 -g 68 -m 0775 altroot/var/spool/lock;
+	install -d -o 80 -g 80 -m 0775 altroot/var/spool/lighttpd;
+	install -d -o 80 -g 80 altroot/var/spool/lighttpd/sockets;
 	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;
+	install -d -o 59 -g 59 altroot/var/unbound;
 
 	ln -fs /tmp altroot/var/tmp;
 
@@ -99,11 +102,8 @@ 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 -
 }
 
@@ -116,8 +116,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;
@@ -140,10 +146,9 @@ MakeFS_etc()
 	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;
+#	ln -sf /elwix/pkg/etc/mk.conf $1/etc/mk.conf;
 
 	echo ${TARGET_ARCH} >$1/etc/platform;
 
@@ -187,18 +192,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)
+			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;
+			;;
+		*)
+			;;
+	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;
 }