--- elwix/config/etc/default/rc.initial	2013/01/28 00:40:22	1.1.2.4
+++ elwix/config/etc/default/rc.initial	2013/01/28 01:47:35	1.2
@@ -2,7 +2,7 @@
 #
 # ELWIX Initial RC Menu script
 #
-# $Id: rc.initial,v 1.1.2.4 2013/01/28 00:40:22 misho Exp $
+# $Id: rc.initial,v 1.2 2013/01/28 01:47:35 misho Exp $
 #
 
 trap : 2
@@ -40,6 +40,9 @@ menu()
 			echo
 			echo "Available interfaces: $IFACES"
 			read -p " +Which from them: " iface
+			if [ -z "$iface" ]; then
+				return 1
+			fi
 			read -p " +Name of interface $iface []: " name
 			read -p " +Setup management vlan 4093 on $iface? [no|yes]: " mgmt
 			read -p " +IPv4 address/mask of interface $iface [dhcp|x.x.x.x/x]: " ip4
@@ -111,8 +114,9 @@ menu()
 			camcontrol devlist
 			echo
 			read -p " +Select drive [like: ada1]: " dev
-			if [ -n "$dev" ]; then
-				if `disklabel $dev`; then
+			if [ -n "$dev" -a -x /usr/sbin/diskinfo ]; then
+				diskinfo $dev
+				if [ $? -eq 0 ]; then
 					read -p " +This is right choice? [no|yes]: " ask
 					if [ X"$ask" = X"yes" -o X"$ask" = X"y" ]; then
 						sysctl -w kern.geom.debugflags=16