elwix/config/rc.subr - diff

Return to rc.subr CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / elwix / config

Diff for /elwix/config/rc.subr between versions 1.6.2.2 and 1.8.2.3

version 1.6.2.2, 2013/07/31 16:05:36	version 1.8.2.3, 2014/01/21 16:33:40
Line 62 MakeFS_var()	Line 62 MakeFS_var()
install -d altroot/var/db;	install -d altroot/var/db;
install -d -m 0555 altroot/var/empty;	install -d -m 0555 altroot/var/empty;
install -d altroot/var/log;	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 101 -g 101 altroot/var/log/quagga;
install -d -o 883 -g 883 altroot/var/mqtt;	install -d -o 883 -g 883 altroot/var/mqtt;
install -d altroot/var/named;	install -d altroot/var/frm;
install -d altroot/var/run;	install -d altroot/var/run;
install -d altroot/var/sys;	install -d -o 80 -g 80 altroot/var/run/lighttpd;
install -d -o 53 -g 53 altroot/var/run/named;
install -d -o 101 -g 101 altroot/var/run/quagga;	install -d -o 101 -g 101 altroot/var/run/quagga;
install -d altroot/var/spool;	install -d altroot/var/spool;
install -d -o 66 -g 68 -m 0775 altroot/var/spool/lock;	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/lpd;
install -d -g 1 altroot/var/spool/output;	install -d -g 1 altroot/var/spool/output;
install -d -g 1 altroot/var/spool/output/lpd;	install -d -g 1 altroot/var/spool/output/lpd;
	install -d -o 59 -g 59 altroot/var/unbound;

ln -fs /tmp altroot/var/tmp;	ln -fs /tmp altroot/var/tmp;

Line 99 MakeFS_var()	Line 102 MakeFS_var()
touch altroot/var/log/ppp.log	touch altroot/var/log/ppp.log
chgrp 69 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	install -v $2/resolv.safe altroot/var/run/resolv.conf

chown -hR root:wheel .
cd -	cd -
}	}

Line 116 MakeFS_etc()	Line 116 MakeFS_etc()

chown -R root:wheel $1/etc;	chown -R root:wheel $1/etc;

chmod 0600 $1/etc/opieaccess;	case "$3" in
chmod 0600 $1/etc/opiekeys;	uboot)
	;;
	*)
	chmod 0600 $1/etc/opieaccess;
	chmod 0600 $1/etc/opiekeys;
	;;
	esac

chmod 0600 $1/etc/master.passwd;	chmod 0600 $1/etc/master.passwd;
chmod 0600 $1/etc/spwd.db;	chmod 0600 $1/etc/spwd.db;
Line 140 MakeFS_etc()	Line 146 MakeFS_etc()
ln -sf /usr/share/zoneinfo/${TIMEZONE} $1/etc/localtime;	ln -sf /usr/share/zoneinfo/${TIMEZONE} $1/etc/localtime;
ln -sf /usr/share/misc/termcap $1/etc/termcap;	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 /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;	echo ${TARGET_ARCH} >$1/etc/platform;

Line 153 MakeFS_etc()	Line 158 MakeFS_etc()
CleanCVS $1/etc	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;

	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;
	fi;
	}

# $1 = ELWIX install list config	# $1 = ELWIX install list config
# $2 = From World dir	# $2 = From World dir
# $3 = To Dest dir	# $3 = To Dest dir
Line 203 InstallFiles()	Line 259 InstallFiles()
tar -cvf - -T - \| tar -C $3 -xf -	tar -cvf - -T - \| tar -C $3 -xf -
cd -	cd -
fi	fi
	}

	# $1 = From dir
	# $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
}	}

# $1 = Directory for clean	# $1 = Directory for clean

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.6.2.2
changed lines
	Added in v.1.8.2.3