elwix/config/etc/rootfs/rc - diff

Return to rc CVS log

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

Diff for /elwix/config/etc/rootfs/rc between versions 1.7 and 1.7.2.4

version 1.7, 2017/02/13 16:52:47	version 1.7.2.4, 2017/10/08 00:05:37
Line 18 EDITOR=vi	Line 18 EDITOR=vi
PAGER=less	PAGER=less
export HOME PATH TERM BLOCKSIZE EDITOR PAGER	export HOME PATH TERM BLOCKSIZE EDITOR PAGER

	ETCDEV="md1"
	ETCSIZE="8m"

FRMDEV="md3"	FRMDEV="md3"
FRMSIZE="42m"	FRMSIZE="42m"
FRMFILE="elwix-firmware.sys"	FRMFILE="elwix-firmware.sys"
Line 30 FRMPATH="/elwix"	Line 33 FRMPATH="/elwix"
FIT2CF="/dev/ufs/fit2cf"	FIT2CF="/dev/ufs/fit2cf"
CFDIR="/elwix/cf"	CFDIR="/elwix/cf"

	ELWIX2="/dev/ufs/elwix2"
	ELWIX="/dev/ufs/elwix"

umask 022	umask 022

failed_sysvol()	failed_sysvol()
Line 43 boot_elwix()	Line 49 boot_elwix()
{	{
echo " RootFS: Loading ELWIX system firmware"	echo " RootFS: Loading ELWIX system firmware"

mdmfs -s $FRMSIZE -S -m0 -oasync $FRMDEV /usr	mdmfs -s $FRMSIZE -S -n -m0 -oasync $FRMDEV /usr
if [ "$?" != "0" ]; then	if [ "$?" != "0" ]; then
failed_sysvol "to mount firmware image " $FRMFILE	failed_sysvol "to mount firmware image " $FRMFILE
fi	fi
Line 60 boot_elwix2()	Line 66 boot_elwix2()
{	{
echo " RootFS: Loading ELWIX secondary firmware"	echo " RootFS: Loading ELWIX secondary firmware"

mdmfs -s $FRMSIZE2 -S -m0 -oasync $FRMDEV2 /usr/local	mdmfs -s $FRMSIZE2 -S -n -m0 -oasync $FRMDEV2 /elwix/pkg
if [ "$?" != "0" ]; then	if [ "$?" != "0" ]; then
failed_sysvol "to mount firmware image " $FRMFILE2	failed_sysvol "to mount firmware image " $FRMFILE2
fi	fi
cd /usr/local	cd /elwix/pkg
pax -r -z -pe -f $FRMPATH/$FRMFILE2	pax -r -z -pe -f $FRMPATH/$FRMFILE2
if [ "$?" != "0" ]; then	if [ "$?" != "0" ]; then
failed_sysvol "to load firmware image " $FRMFILE2	failed_sysvol "to load firmware image " $FRMFILE2
fi	fi
cd -	cd -
mount -ur /usr/local	mount -ur /elwix/pkg
}	}

mount_usr()	mount_usr()
Line 89 mount_usr()	Line 95 mount_usr()

echo "ELWIX>>> Firmware RootFS boot stage ..."	echo "ELWIX>>> Firmware RootFS boot stage ..."

	if test -c $ELWIX2; then
	BOOTSLICE=`kenv currdev`
	if test "${BOOTSLICE#disk0}" != "a:"; then
	ELWIX=$ELWIX2
	fi
	fi

	if ! mount -o ro $ELWIX $FRMPATH; then
	umount $FRMPATH
	fsck -y $ELWIX 1>/dev/null 2>&1
	if ! mount -o ro $ELWIX $FRMPATH; then
	umount -f $FRMPATH
	fsck -f -y $ELWIX 1>/dev/null 2>&1
	if ! mount -o ro $ELWIX $FRMPATH; then
	failed_sysvol mount "system volume"
	fi
	fi
	fi

if ! mount -a; then	if ! mount -a; then
umount -A	umount -A
fsck -y 1>/dev/null 2>&1	fsck -y 1>/dev/null 2>&1
Line 103 fi	Line 128 fi

if test -c "$FIT2CF" -a -d "$CFDIR"; then	if test -c "$FIT2CF" -a -d "$CFDIR"; then
echo " RootFS: Mount ELWIX flash volume"	echo " RootFS: Mount ELWIX flash volume"
fsck -y -tufs $FIT2CF 1>/dev/null 2>&1 && mount -o ro $FIT2CF $CFDIR \|\| \	if ! mount -o ro $FIT2CF $CFDIR; then
failed_sysvol mount "flash volume"	umount $CFDIR
	fsck -y -tufs $FIT2CF 1>/dev/null 2>&1
	if ! mount -o ro $FIT2CF $CFDIR; then
	echo "Error:: mount of $FIT2CF to $CFDIR failed!"
	fi
	fi
fi	fi

if [ -r $FRMPATH/$FRMFILE ]; then	if [ -r $FRMPATH/$FRMFILE ]; then
Line 120 fi	Line 150 fi
if [ -r $FRMPATH/$FRMFILE2 ]; then	if [ -r $FRMPATH/$FRMFILE2 ]; then
boot_elwix2	boot_elwix2
fi	fi

	cd /elwix
	mdmfs -s $ETCSIZE -S -n -m0 -oasync $ETCDEV /etc
	pax -rw -pe etc /

exec /etc/rc.init	exec /etc/rc.init

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

Removed from v.1.7
changed lines
	Added in v.1.7.2.4