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.8.2.4 and 1.10.2.3

version 1.8.2.4, 2014/01/22 09:32:01	version 1.10.2.3, 2017/06/14 23:16:12
Line 51 MakeFS_var()	Line 51 MakeFS_var()
cd $1	cd $1

install -d altroot;	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;
install -d altroot/var/account;	install -d altroot/var/account;
install -d altroot/var/at;	install -d altroot/var/at;
Line 60 MakeFS_var()	Line 67 MakeFS_var()
install -d -m 0750 altroot/var/cron;	install -d -m 0750 altroot/var/cron;
install -d -m 0700 altroot/var/cron/tabs;	install -d -m 0700 altroot/var/cron/tabs;
install -d altroot/var/db;	install -d altroot/var/db;
	install -d altroot/var/db/etc;
	install -d altroot/var/db/keys;
	install -d altroot/var/db/pkg;
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 80 -g 80 -m 0700 altroot/var/log/lighttpd;
Line 103 MakeFS_var()	Line 113 MakeFS_var()
chgrp 69 altroot/var/log/ppp.log	chgrp 69 altroot/var/log/ppp.log

install -v $2/resolv.safe altroot/var/run/resolv.conf	install -v $2/resolv.safe altroot/var/run/resolv.conf
	install -v ${WORLD}/usr/share/keys/pkg/trusted/* altroot/pkg/keys/trusted

cd -	cd -
}	}
Line 120 MakeFS_etc()	Line 131 MakeFS_etc()
uboot)	uboot)
;;	;;
*)	*)
chmod 0600 $1/etc/opieaccess;	# chmod 0600 $1/etc/opieaccess;
chmod 0600 $1/etc/opiekeys;	# chmod 0600 $1/etc/opiekeys;
;;	;;
esac	esac

Line 131 MakeFS_etc()	Line 142 MakeFS_etc()
chmod 0600 $1/etc/ssh/ssh_host_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_rsa_key;
chmod 0600 $1/etc/ssh/ssh_host_ecdsa_key;	chmod 0600 $1/etc/ssh/ssh_host_ecdsa_key;
	chmod 0600 $1/etc/ssh/ssh_host_ed25519_key;

chmod 0440 $1/etc/sudoers;	chmod 0440 $1/etc/sudoers;

chgrp 80 $1/etc/config.xml;	# chgrp 80 $1/etc/config.xml;
chmod 0660 $1/etc/config.xml;	# chmod 0660 $1/etc/config.xml;

mkdir -p $1/etc/mqtt;	mkdir -p $1/etc/mqtt;
chgrp -R 883 $1/etc/mqtt;	chgrp -R 883 $1/etc/mqtt;
Line 178 MakeFS_backup()	Line 190 MakeFS_backup()
mkdir -p $1/altroot/backup	mkdir -p $1/altroot/backup

cd $1	cd $1
cp -p etc/config.xml altroot/backup	# cp -p etc/config.xml altroot/backup
tar -czf altroot/backup/.etc.tgz etc	tar -czf altroot/backup/.etc.tgz etc

cd altroot	cd altroot
Line 193 MakeFS_boot()	Line 205 MakeFS_boot()
install -m 644 ${CFGDIR}/boot/boot.config $1;	install -m 644 ${CFGDIR}/boot/boot.config $1;

case ${TARGET} in	case ${TARGET} in
i386)	i386\|amd64)
install -m 444 ${CFGDIR}/boot/beastie.4th $1/boot;	install -m 444 ${CFGDIR}/boot/logo-elwix.4th $1/boot;
install -m 444 ${CFGDIR}/boot/brand.4th $1/boot;	install -m 444 ${CFGDIR}/boot/brand-elwix.4th $1/boot;
install -m 444 ${CFGDIR}/boot/menu.4th $1/boot;	install -m 444 ${CFGDIR}/boot/menu.4th $1/boot;
;;	;;
*)	*)
Line 225 InstallList()	Line 237 InstallList()
for i in $(cat $TMPFILE); do	for i in $(cat $TMPFILE); do
if [ -x $i ]; then	if [ -x $i ]; then
echo "Strip '$i'"	echo "Strip '$i'"
	${CEXEC} chflags -f noschg $i
${CEXEC} strip -s $i	${CEXEC} strip -s $i
fi	fi
done	done
Line 265 InstallFiles()	Line 278 InstallFiles()
# $2 = To dir	# $2 = To dir
InstallLibs()	InstallLibs()
{	{
${CEXEC} find -X $2 ! -name "*.ko" -and -type f -and -perm +111 \| \	${CEXEC} find -X $2 ! -name "*.ko" -and -type f \| \
xargs readelf -d 2>&- \| grep "NEEDED" \| sort \| uniq \| \	xargs readelf -d 2>&- \| grep "NEEDED" \| sort \| uniq \| \
awk '($2 == "(NEEDED)") { print substr($5, 2, length($5) - 2); }' \	awk '($2 == "(NEEDED)") { print substr($5, 2, length($5) - 2); }' \
2>/dev/null >${DEST}/elwix_mklibs.tmp	2>/dev/null >${DEST}/elwix_mklibs.tmp
for i in $(cat ${DEST}/elwix_mklibs.tmp); do	for i in $(cat ${DEST}/elwix_mklibs.tmp); do
echo $i	echo $i
${CEXEC} find $1 -type f -name $i -exec install -v {} $LIBS \\\;	${CEXEC} find $1 -type f -name $i -exec install -v {} $LIBS \\\;
	${CEXEC} chflags -f noschg $LIBS/$i
${CEXEC} strip -s $LIBS/$i	${CEXEC} strip -s $LIBS/$i
done	done
# ${CEXEC} find -X $2 ! -name "*.ko" -and -type f -and -perm +111 \| \	# ${CEXEC} find -X $2 ! -name "*.ko" -and -type f -and -perm +111 \| \
Line 303 StripFiles()	Line 317 StripFiles()
for i in $(cat $TMPFILE); do	for i in $(cat $TMPFILE); do
if [ -x $i ]; then	if [ -x $i ]; then
echo "Strip '$i'"	echo "Strip '$i'"
	${CEXEC} chflags -f noschg $i
${CEXEC} strip -s $i	${CEXEC} strip -s $i
fi	fi
done	done

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

Removed from v.1.8.2.4
changed lines
	Added in v.1.10.2.3