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.1.1.1.6.10 and 1.2.2.3

version 1.1.1.1.6.10, 2012/10/10 09:14:25	version 1.2.2.3, 2013/01/28 09:48:56
Line 19 PAGER=less	Line 19 PAGER=less
export HOME PATH TERM BLOCKSIZE EDITOR PAGER	export HOME PATH TERM BLOCKSIZE EDITOR PAGER

FRMDEV="md1"	FRMDEV="md1"
FRMSIZE="82m"	FRMSIZE="41m"
FRMFILE="elwix-firmware.sys"	FRMFILE="elwix-firmware.sys"
FRMPATH="/elwix"

	FRMDEV2="md2"
	FRMSIZE2="21m"
	FRMFILE2="elwix-firmware2.sys"

	FRMPATH="/elwix"
FIT2CF="/dev/ufs/fit2cf"	FIT2CF="/dev/ufs/fit2cf"
CFDIR="/elwix/cf"	CFDIR="/elwix/cf"

Line 41 boot_elwix()	Line 45 boot_elwix()

mdmfs -s $FRMSIZE -S -m0 -oasync $FRMDEV /usr	mdmfs -s $FRMSIZE -S -m0 -oasync $FRMDEV /usr
if [ "$?" != "0" ]; then	if [ "$?" != "0" ]; then
failed_sysvol "to mount firmware image " elwix-firmware.sys	failed_sysvol "to mount firmware image " $FRMFILE
fi	fi
cd /usr	cd /usr
pax -r -z -pe -f $FRMPATH/$FRMFILE	pax -r -z -pe -f $FRMPATH/$FRMFILE
if [ "$?" != "0" ]; then	if [ "$?" != "0" ]; then
failed_sysvol "to load firmware image " elwix-firmware.sys	failed_sysvol "to load firmware image " $FRMFILE
fi	fi
cd -	cd -
mount -ur /usr	mount -ur /usr
}	}

	boot_elwix2()
	{
	echo " RootFS: Loading ELWIX secondary firmware"

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

mount_usr()	mount_usr()
{	{
echo " RootFS: Mounting ELWIX system image"	echo " RootFS: Mounting ELWIX system image"

mount -t nullfs -r $FRMPATH/usr /usr	mount -t nullfs -r $FRMPATH/usr /usr
if [ "$?" != "0" ]; then	if [ "$?" != "0" ]; then
failed_sysvol "to mount system image " elwix-firmware.sys	failed_sysvol "to mount system image " $FRMFILE
fi	fi
}	}

Line 68 mount_usr()	Line 89 mount_usr()

echo "ELWIX>>> Firmware RootFS boot stage ..."	echo "ELWIX>>> Firmware RootFS boot stage ..."
echo " RootFS: Mount ELWIX system volume"	echo " RootFS: Mount ELWIX system volume"
fsck -q -y 1>/dev/null 2>&1 && mount -a \|\| fsck -y 1>/dev/null 2>&1 && mount -a \|\| \	fsck -y 1>/dev/null 2>&1 && mount -a \|\| fsck -y 1>/dev/null 2>&1 && mount -a \|\| \
fsck -f -y 1>/dev/null 2>&1 && mount -a \|\| failed_sysvol mount "system volume"	fsck -f -y 1>/dev/null 2>&1 && mount -a \|\| failed_sysvol mount "system volume"

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 \|\| \	fsck -y -tufs $FIT2CF 1>/dev/null 2>&1 && mount -o ro $FIT2CF $CFDIR \|\| \
	fsck -y -tufs $FIT2CF 1>/dev/null 2>&1 && mount -o ro $FIT2CF $CFDIR \|\| \
fsck -f -y -tufs $FIT2CF 1>/dev/null 2>&1 && mount -o ro $FIT2CF $CFDIR \|\| \	fsck -f -y -tufs $FIT2CF 1>/dev/null 2>&1 && mount -o ro $FIT2CF $CFDIR \|\| \
failed_sysvol mount "flash volume"	failed_sysvol mount "flash volume"
fi	fi
Line 86 else	Line 108 else
else	else
echo " RootFS: Skip loading ELWIX system firmware ..."	echo " RootFS: Skip loading ELWIX system firmware ..."
fi	fi
	fi

	if [ -r $FRMPATH/$FRMFILE2 ]; then
	boot_elwix2
fi	fi

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

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

Removed from v.1.1.1.1.6.10
changed lines
	Added in v.1.2.2.3