--- elwix/config/etc/default/rc.init 2011/07/05 23:43:00 1.1 +++ elwix/config/etc/default/rc.init 2012/10/12 08:22:44 1.2 @@ -2,7 +2,7 @@ # # Boot startup script for elwix :) # -# $Id: rc.init,v 1.1 2011/07/05 23:43:00 misho Exp $ +# $Id: rc.init,v 1.2 2012/10/12 08:22:44 misho Exp $ stty status '^T' @@ -18,10 +18,14 @@ EDITOR=vi PAGER=less export HOME PATH TERM BLOCKSIZE EDITOR PAGER -SYSPKGDIR="/system" +SYSPKGDIR="/var/sys" BOOTLOG="/var/run/elwix.boot" XML="/etc/config.xml" +MGMT_VLAN="4093" +MGMT_NAME="mgmt" +MGMT_ADDR="10.254.254.254/30" + umask 022 boot() @@ -29,12 +33,6 @@ boot() echo "Check and mount filesystems ..." fsck -y 1>/dev/null 2>&1 && mount -a || fsck -f -y - if [ -c /dev/ufs/fit2cf ]; then - echo "Check and mount if its exist fit2cf ..." - fsck -y -tufs /dev/ufs/fit2cf 1>/dev/null 2>&1 && mount -o ro /dev/ufs/fit2cf /elwix/cf || \ - fsck -f -y -tufs /dev/ufs/fit2cf - fi - echo "Loading elwix firmware variables ..." cd /elwix/altroot pax -rw -pe var / @@ -60,8 +58,10 @@ local() echo "Configurate localhost ..." | tee -a $BOOTLOG ifconfig lo0 127.0.0.1 | tee -a $BOOTLOG 1>/dev/null 2>&1 hostname `cat /etc/myname` - hostname `xmler -g /elwix/system/hostname $XML` - domainname `xmler -g /elwix/system/domain $XML` + if [ -x /usr/bin/xmler ]; then + hostname `xmler -g /elwix/system/hostname $XML` + domainname `xmler -g /elwix/system/domain $XML` + fi } geteth() @@ -75,10 +75,18 @@ geteth() mgmt() { [ -r /etc/mylan ] && VDEV=`cat /etc/mylan` - VDEV=${VDEV:-`get1steth -g`} + if [ -x /usr/bin/get1steth ]; then + VDEV=${VDEV:-`get1steth -g`} + get1steth -v $VDEV | tee -a $BOOTLOG 1>/dev/null 2>&1 + else + VDEV=${VDEV:-`geteth`} + ifconfig vlan$MGMT_VLAN create vlan $MGMT_VLAN vlandev $VDEV + ifconfig vlan$MGMT_VLAN name $MGMT_NAME + ifconfig $MGMT_NAME inet $MGMT_ADDR + fi + echo "Configurete management interface to ($VDEV) ..." | tee -a $BOOTLOG - get1steth -v $VDEV | tee -a $BOOTLOG 1>/dev/null 2>&1 } syspkg() @@ -88,7 +96,7 @@ syspkg() echo "Mounting firmware system packages:" | tee -a $BOOTLOG # Raw images - for i in /elwix/cf/*-firmware; do + for i in /elwix/cf/*-pkg.fw; do if [ -r $i ]; then MDDEV=$(mdconfig -a -t vnode -f $i); install -d $SYSPKGDIR/$MDDEV; @@ -110,7 +118,7 @@ syspkg() fi done # UZIP images - for i in /elwix/cf/*-firmware-pkg; do + for i in /elwix/cf/*-pkg.fwz; do if [ -r $i ]; then MDDEV=$(mdconfig -a -t vnode -f $i); install -d $SYSPKGDIR/$MDDEV;