[SM-Commit] PERFORCE change 80514 by Juuso Alasuutari for review

Perforce Review Daemon p4review at smee.org
Sun Jun 11 15:35:01 EDT 2006


Change 80514 by juuso_alasuutari at juuso_alasuutari-kamayuq on 2006/06/11 20:31:08

	Version 1.8 to test

Affected files ...

... //sgl/grimoires/test/net/netconf/DETAILS#5 integrate
... //sgl/grimoires/test/net/netconf/HISTORY#13 integrate
... //sgl/grimoires/test/net/netconf/netconf#8 integrate

Differences ...

==== //sgl/grimoires/test/net/netconf/DETAILS#5 (xtext) ====

@@ -1,11 +1,9 @@
            SPELL=netconf
-         VERSION=1.6
+         VERSION=1.8
          ENTERED=20030722
          UPDATED=20060306
-      MAINTAINER='abouter at sourcemage.org'
         KEYWORDS="net"
            SHORT='Source Mage network configuration tool'
-       BUILD_API=2
 cat << EOF
 netconf is the Source Mage network configuration tool. Simply
 run 'netconf' to configure your network devices!

==== //sgl/grimoires/test/net/netconf/HISTORY#13 (text) ====

@@ -1,3 +1,12 @@
+2006-06-09  Juuso Alasuutari <iuso at sourcemage.org>
+	* DETAILS: Updated to version 1.8 (the program itself was 
+	  already at 1.7 but the spell was still 1.6 for some reason). 
+	  Removed MAINTAINER and BUILD_API=2.
+	* netconf: Added DEVICE_MAC option, to be used by udev binding 
+	  rule. Fixed and modified a lot of menu texts. Modified 
+	  hostname submenus to that Cancel returns to Hostname menu 
+	  instead of Main. Updated version to 1.8.
+
 2006-05-14 Matthew Clark <matthewclark at inlesserterms.net>
 	* netconf: removed functionality that points hostname to
 	  127.0.0.1 in hosts file, fixes bug 11694

==== //sgl/grimoires/test/net/netconf/netconf#8 (text) ====

@@ -2,7 +2,7 @@
 #
 # vi: ts=4 sw=4 noet
 #--------------------------- bashdoc ---------------------------------#
-## @Synposis   Source Mage network configuration tool
+## @Synopsis   Source Mage network configuration tool
 ## @Copyright  Copyright 2003-2004 Source Mage Team
 ## @License    GPL v2
 ##
@@ -46,6 +46,16 @@
 #---------------------------------------------------------------------#
 #
 # ------------------------- ChangeLog ------------------------------- #
+# 2006-06-09  Juuso Alasuutari <iuso at sourcemage.org>
+#    - Added DEVICE_MAC option to be used by udev for binding interface 
+#      names to devices. At the moment udev spell's 07-bindings.rules 
+#      compares against $MAC, which is a bug because $MAC is volatile.
+#    - Modified menu texts to fix spelling and formatting errors.
+#    - Modified the hostname submenus so that selecting Cancel in e.g. 
+#      the Hostname area menu returns back to Configure hostname menu 
+#      instead of main menu. 
+#    - Version 1.8.
+#
 # 2006-05-14  Matthew Clark <matthewclark at inlesserterms.net>
 #    - Removed the line that adds hostname to hosts file as
 #      127.0.0.1 (bug 11649)
@@ -255,7 +265,7 @@
 #        HOSTSFN: name of file containing hosts
 #       RESOLVFN: name of file containing nameservers
 #
-NETCONFVERSION='1.7'
+NETCONFVERSION='1.8'
 ROOTCHECK=1
 NETDEVDIR=/etc/sysconfig/network
 HOSTNAMEFN=/etc/hostname
@@ -488,7 +498,7 @@
 		                 --ok-label       "$BTN_SELECT"      \
 		                 --cancel-label   "$BTN_CANCEL"      \
 		                 --menu                              \
-		                 "Choose a name server to modify:"   \
+		                 "Choose a name server to modify."   \
 		                 0 0 0                               \
 		                 "1" "$ns1"                          \
 		                 "2" "$ns2"                          \
@@ -570,7 +580,7 @@
 	# prompt user to change hostname
 	COMMAND=`$DIALOG --backtitle "$BACKTITLE"                \
 	                 --stdout                                \
-	                 --title "Configure Hostname"            \
+	                 --title "Enter hostname"                \
 	                 --ok-label       "$BTN_ACCEPT"          \
 	                 --cancel-label   "$BTN_CANCEL"          \
 	                 --inputbox                              \
@@ -582,6 +592,8 @@
 		curhostname="$COMMAND"
 		echo "$curhostname" > $HOSTNAMEFN
 		mangle_hosts
+	else
+		cfg_hostname
 	fi
 
 }
@@ -596,12 +608,12 @@
 
   local HOSTNAMELIST=`cat /usr/share/netconf/$1 | awk '{print $1; print "\"\""}'`
 
-  eval $DIALOG '  --title "Select hostname from $1 area"  \
-           --ok-label  "Select"            \
-           --stdout                        \
-           --menu                          \
-           ""                              \
-           0 0 0                           \
+  eval $DIALOG '  --title "$1"                 \
+           --ok-label  "Select"                \
+           --stdout                            \
+           --menu                              \
+           "Select hostname from area \"$1\""  \
+           0 0 0                               \
            '$HOSTNAMELIST
 
 }
@@ -615,12 +627,12 @@
 
   local HOSTNAMEAREALIST=`ls /usr/share/netconf | awk '{print $1; print "\"\""}'`
 
-  HOSTNAMEAREA=`eval $DIALOG '  --title "Select hostname area"  \
-           --ok-label  "Select"            \
-           --stdout                        \
-           --menu                          \
-           ""                              \
-           0 0 0                           \
+  HOSTNAMEAREA=`eval $DIALOG '  --title "Hostname area"  \
+           --ok-label  "Select"                    \
+           --stdout                                \
+           --menu                                  \
+           "Select area to choose hostname from."  \
+           0 0 0                                   \
            '$HOSTNAMEAREALIST`
 
   COMMAND=`cfg_hostname_choose $HOSTNAMEAREA`
@@ -630,6 +642,8 @@
                 curhostname="$COMMAND"
                 echo "$curhostname" > $HOSTNAMEFN
                 mangle_hosts
+	else
+		cfg_hostname
         fi
 
 }
@@ -654,7 +668,7 @@
                          --ok-label       "$BTN_SELECT"                       \
                          --cancel-label   "$BTN_BACK"                         \
                          --menu                                               \
-                         "Choose how to configure the hostname."              \
+                         "Choose how to configure the hostname. [$HOSTNAME]"              \
                          0 0 0                                                \
                          "Enter"  "Enter a hostname"                          \
                          "Choose" "Choose from a list of proposed hostnames"`
@@ -781,6 +795,7 @@
 ## @Global    WIFI_KEY3: wifi encryption key 3.<br>
 ## @Global    WIFI_KEY4: wifi encryption key 4.<br>
 ## @Global    WIFI_DEFAULTKEY: wifi encryption default key.<br>
+## @Global    DEVICE_MAC: device's MAC address.<br>
 ## @Global    MAC: MAC address.<br>
 ## @Global    CUSTOM: any custom options.<br>
 ## @Global    UP_ON_BOOT: 'no' if device should not be brought up on boot<br>
@@ -797,7 +812,7 @@
 	unset MODULE MODE IP BROADCAST NETMASK GATEWAY POINTOPOINT MTU \
               WIFI_NWID WIFI_ESSID WIFI_RATE WIFI_MODE WIFI_SECMODE \
               WIFI_KEY WIFI_KEY1 WIFI_KEY2 WIFI_KEY3 WIFI_KEY4 WIFI_DEFAULTKEY \
-              MAC CUSTOM UP_ON_BOOT NEEDS
+              DEVICE_MAC MAC CUSTOM UP_ON_BOOT NEEDS
 
 	devname=$(get_basename $1 .dev)
 
@@ -827,7 +842,7 @@
 	                 --ok-label       "$BTN_ACCEPT"                            \
 	                 --cancel-label   "$BTN_CANCEL"                            \
 	                 --inputbox                                                \
-	                 "Enter the name of the kernel module which your device uses, without the trailing .o" \
+	                 "Enter the name of the kernel module which your device uses, without the trailing \".o\"." \
 	                 0 0 $MODULE`
 
 	if [ $? -eq 0 ]; then
@@ -895,7 +910,7 @@
 	                 --ok-label       "$BTN_SELECT"                            \
 	                 --cancel-label   "$BTN_BACK"                              \
 	                 --menu                                                    \
-	                 "Choose how to select the kernel module, select 'None' if the driver is compiled into the kernel, or select '$BTN_BACK' to keep the current setting (${dmodule})" \
+	                 "Choose how to select the kernel module. Select 'None' if the driver is compiled into the kernel, or select '$BTN_BACK' to keep the current setting. [${dmodule}]" \
 	                 0 0 0                                                     \
 	                 "Enter"  "Enter a module name"                            \
 	                 "Choose" "Choose from a list of available network modules"\
@@ -931,13 +946,7 @@
 	                 --ok-label       "$BTN_SELECT"                            \
 	                 --cancel-label   "$BTN_BACK"                              \
 	                 --menu                                                    \
-	                 "Choose which mode this network device uses.              \
-                      Select 'dynamic_set_hostname' to use dhcp with your own  \
-					  hostname, 'dynamic_get_hostname' to set the hostname     \
-					  provided by the DHCP server or select 'static'           \
-                      to specify IP, BROADCAST, NETMASK, GATEWAY, or           \
-                      select '${BTN_BACK}' to keep current setting             \
-                     (${MODE})"                                                \
+	                 "Choose which mode this network device uses. Select 'dynamic_set_hostname' to use dhcp with your own hostname, 'dynamic_get_hostname' to set the hostname provided by the DHCP server, or 'static' to specify IP, BROADCAST, NETMASK, and GATEWAY. Select '${BTN_BACK}' to keep current setting. [${MODE}]" \
 	                 0 0 0                                                     \
 	                 "dynamic_set_hostname" "use dhcp"                         \
 	                 "dynamic_get_hostname" "use dhcp"                         \
@@ -1061,7 +1070,7 @@
 	                 --ok-label       "$BTN_ACCEPT"                            \
 	                 --cancel-label   "$BTN_CANCEL"                            \
 	                 --inputbox                                                \
-	                 "Enter the point to point address for this network device"\
+	                 "Enter the point to point address for this network device."\
 	                 0 0 $POINTOPOINT`
 
 	if [ $? -eq 0 ]; then
@@ -1084,7 +1093,7 @@
 	                 --ok-label       "$BTN_ACCEPT"                            \
 	                 --cancel-label   "$BTN_CANCEL"                            \
 	                 --inputbox                                                \
-	                 "Enter the maximum transfer unit for this network device" \
+	                 "Enter the maximum transfer unit for this network device." \
 	                 0 0 $MTU`
 
 	if [ $? -eq 0 ]; then
@@ -1107,7 +1116,7 @@
 	                 --ok-label       "$BTN_ACCEPT"             \
 	                 --cancel-label   "$BTN_CANCEL"             \
 	                 --inputbox                                 \
-	                 "Enter network name (ONLY for pre-802.11 hardware!)" \
+	                 "Enter network name. (ONLY for pre-802.11 hardware!)" \
 	                 0 0 ${WIFI_NWID}`
 
 	if [ $? -eq 0 ]; then
@@ -1129,7 +1138,7 @@
 	                 --ok-label       "$BTN_ACCEPT"             \
 	                 --cancel-label   "$BTN_CANCEL"             \
 	                 --inputbox                                 \
-	                 "Enter the ssid of the network (default: any)" \
+	                 "Enter the SSID of the network. (default: any)" \
 	                 0 0 ${WIFI_ESSID}`
 
 	if [ $? -eq 0 ]; then
@@ -1145,13 +1154,13 @@
 ## @External  dialog
 #---
 function cfg_wifi_rate() {
-	COMMAND=`$DIALOG --backtitle "$BACKTITLE"                   \
-	                 --stdout                                   \
-	                 --title "Configure the bitrate"            \
-	                 --ok-label       "$BTN_ACCEPT"             \
-	                 --cancel-label   "$BTN_CANCEL"             \
-	                 --inputbox                                 \
-	                 "Enter maximum bitrate of the network (examples: 5,5 11 or 54)" \
+	COMMAND=`$DIALOG --backtitle "$BACKTITLE"        \
+	                 --stdout                        \
+	                 --title "Configure bitrate"     \
+	                 --ok-label       "$BTN_ACCEPT"  \
+	                 --cancel-label   "$BTN_CANCEL"  \
+	                 --inputbox                      \
+	                 "Enter maximum bitrate of the network. (Examples: 5,5 11 or 54.)" \
 	                 0 0 ${WIFI_RATE}`
 
 	if [ $? -eq 0 ]; then
@@ -1167,15 +1176,15 @@
 ## @External  dialog
 #---
 function cfg_wifi_mode() {
-	COMMAND=`$DIALOG --backtitle "$BACKTITLE"                   \
-	                 --stdout                                   \
-	                 --title "Configure the mode"               \
-	                 --ok-label       "$BTN_ACCEPT"             \
-	                 --cancel-label   "$BTN_CANCEL"             \
-	                 --menu                                     \
-	                 "Select if you're using ad-hoc or managed mode" \
-	                 0 0 0                                      \
-                         "1"	"Managed (default)"                 \
+	COMMAND=`$DIALOG --backtitle "$BACKTITLE"          \
+	                 --stdout                          \
+	                 --title "Configure network mode"  \
+	                 --ok-label       "$BTN_ACCEPT"    \
+	                 --cancel-label   "$BTN_CANCEL"    \
+	                 --menu                            \
+	                 "Select if you're using ad-hoc or managed mode." \
+	                 0 0 0                             \
+                         "1"	"Managed (default)"        \
 			 "2"	"Ad-Hoc"`
 
 	if [ $? -eq 0 ]; then
@@ -1194,15 +1203,15 @@
 ## @External  dialog
 #---
 function cfg_wifi_secmode() {
-	COMMAND=`$DIALOG --backtitle "$BACKTITLE"                   \
-	                 --stdout                                   \
-	                 --title "Configure the security mode"      \
-	                 --ok-label       "$BTN_ACCEPT"             \
-	                 --cancel-label   "$BTN_BACK"               \
-	                 --menu                                     \
-	                 "Select the security mode"                 \
-	                 0 0 0                                      \
-                         "1"	"Open (default)"                    \
+	COMMAND=`$DIALOG --backtitle "$BACKTITLE"        \
+	                 --stdout                        \
+	                 --title "Security mode"         \
+	                 --ok-label       "$BTN_ACCEPT"  \
+	                 --cancel-label   "$BTN_BACK"    \
+	                 --menu                          \
+	                 "Select the security mode."     \
+	                 0 0 0                           \
+                         "1"	"Open (default)"         \
 			 "2"	"Restricted"`
 
 	if [ $? -eq 0 ]; then
@@ -1221,15 +1230,15 @@
 ## @External  dialog
 #---
 function cfg_wifi_enablekey() {
-	COMMAND=`$DIALOG --backtitle "$BACKTITLE"                   \
-	                 --stdout                                   \
-	                 --title "Configure use of keys"            \
-	                 --ok-label       "$BTN_ACCEPT"             \
-	                 --cancel-label   "$BTN_BACK"               \
-	                 --menu                                     \
-	                 "Enable or disable keys"                   \
-	                 0 0 0                                      \
-                         "1"	"On"                                \
+	COMMAND=`$DIALOG --backtitle "$BACKTITLE"         \
+	                 --stdout                         \
+	                 --title "Configure use of keys"  \
+	                 --ok-label       "$BTN_ACCEPT"   \
+	                 --cancel-label   "$BTN_BACK"     \
+	                 --menu                           \
+	                 "Enable or disable keys."        \
+	                 0 0 0                            \
+                         "1"	"On"                      \
 			 "2"	"Off"`
 
 	if [ $? -eq 0 ]; then
@@ -1248,17 +1257,17 @@
 ## @External  dialog
 #---
 function cfg_wifi_defaultkey() {
-	COMMAND=`$DIALOG --backtitle "$BACKTITLE"                   \
-	                 --stdout                                   \
-	                 --title "Setting the default key"          \
-	                 --ok-label       "$BTN_ACCEPT"             \
-	                 --cancel-label   "$BTN_CANCEL"             \
-	                 --menu                                     \
-	                 "Select the default key to use"            \
-		                 0 0 0                              \
-		                 "1" "$WIFI_KEY1"                   \
-		                 "2" "$WIFI_KEY2"                   \
-		                 "3" "$WIFI_KEY3"                   \
+	COMMAND=`$DIALOG --backtitle "$BACKTITLE"          \
+	                 --stdout                          \
+	                 --title "Default key"             \
+	                 --ok-label       "$BTN_ACCEPT"    \
+	                 --cancel-label   "$BTN_CANCEL"    \
+	                 --menu                            \
+	                 "Select the default key to use."  \
+		                 0 0 0                     \
+		                 "1" "$WIFI_KEY1"          \
+		                 "2" "$WIFI_KEY2"          \
+		                 "3" "$WIFI_KEY3"          \
 		                 "4" "$WIFI_KEY4" `
 
 	if [ $? -eq 0 ]; then
@@ -1287,8 +1296,7 @@
 	                 --ok-label       "$BTN_ACCEPT"             \
 	                 --cancel-label   "$BTN_BACK"               \
 	                 --inputbox                                 \
-	                 "Enter encryption key $1
-(either in s:something or hexadecimal form)"                      \
+	                 "Enter encryption key $1. (Either in s:something or hexadecimal form.)" \
 	                 0 0 "$currentkey" `
 
 	if [ $? -eq 0 ]; then
@@ -1315,18 +1323,18 @@
 #---
 function cfg_wifi_setkeys() {
 	while [ true ]; do
-		COMMAND=`$DIALOG --backtitle "$BACKTITLE"            \
-		                 --stdout                            \
-		                 --title "Configure encryption keys" \
-		                 --ok-label       "$BTN_SELECT"      \
-		                 --cancel-label   "$BTN_BACK"        \
-		                 --menu                              \
-		                 "Choose a encryption key to modify:"   \
-		                 0 0 0                            \
-		                 "1" "$WIFI_KEY1"                 \
-		                 "2" "$WIFI_KEY2"                 \
-		                 "3" "$WIFI_KEY3"                 \
-		                 "4" "$WIFI_KEY4"                 \
+		COMMAND=`$DIALOG --backtitle "$BACKTITLE"        \
+		                 --stdout                        \
+		                 --title "Encryption keys"       \
+		                 --ok-label       "$BTN_SELECT"  \
+		                 --cancel-label   "$BTN_BACK"    \
+		                 --menu                          \
+		                 "Choose encryption key to modify." \
+		                 0 0 0                           \
+		                 "1" "$WIFI_KEY1"                \
+		                 "2" "$WIFI_KEY2"                \
+		                 "3" "$WIFI_KEY3"                \
+		                 "4" "$WIFI_KEY4"                \
 		                 "5" "Default key" `
 
 	    if [ $? = 0 ]; then
@@ -1351,13 +1359,13 @@
 #---
 function cfg_wifi_security_menu() {
     while [ true ]; do
-	COMMAND=`$DIALOG --backtitle "$BACKTITLE"                      \
-	                 --stdout                                      \
-	                 --title "Configure security options"          \
-	                 --ok-label       "$BTN_SELECT"                \
-	                 --cancel-label   "$BTN_BACK"                  \
-	                 --menu                                        \
-	                 "WIFI Security submenu" \
+	COMMAND=`$DIALOG --backtitle "$BACKTITLE"             \
+	                 --stdout                             \
+	                 --title "Wi-Fi security"             \
+	                 --ok-label       "$BTN_SELECT"       \
+	                 --cancel-label   "$BTN_BACK"         \
+	                 --menu                               \
+	                 "Configure Wi-Fi security options."  \
 	                 0 0 0 \
 			 "1" "Security mode (enc)" \
 			 "2" "Encryption keys (key)" \
@@ -1384,13 +1392,13 @@
 #---
 function cfg_wifi() {
     while [ true ]; do
-	COMMAND=`$DIALOG --backtitle "$BACKTITLE"                      \
-	                 --stdout                                      \
-	                 --title "Configure WIFI"                      \
-	                 --ok-label       "$BTN_SELECT"                \
-	                 --cancel-label   "$BTN_BACK"                  \
-	                 --menu                                        \
-	                 "The settings for the wifi network"           \
+	COMMAND=`$DIALOG --backtitle "$BACKTITLE"            \
+	                 --stdout                            \
+	                 --title "Configure WIFI"            \
+	                 --ok-label       "$BTN_SELECT"      \
+	                 --cancel-label   "$BTN_BACK"        \
+	                 --menu                              \
+	                 "Select Wi-Fi settings to modify."  \
 	                 0 0 0 \
 			 "1" "Network or Domain ID" \
 			 "2" "Network name" \
@@ -1416,6 +1424,28 @@
 }
 
 
+#--- cfg_device_mac()
+##
+## This archives the native MAC address for the given device
+##
+## @Global    DEVICE_MAC: native MAC address for the device.<br>
+## @External  dialog
+#---
+function cfg_device_mac() {
+	COMMAND=`$DIALOG --backtitle "$BACKTITLE"                \
+	                 --stdout                                \
+	                 --title "Configure device MAC address"  \
+                         --ok-label       "$BTN_ACCEPT"          \
+	                 --cancel-label   "$BTN_CANCEL"          \
+	                 --inputbox                              \
+	                 "Enter the device's native MAC address. (Used by udev for binding interface name to device.)" \
+	                 0 0 ${DEVICE_MAC}`
+
+	if [ $? -eq 0 ]; then
+		DEVICE_MAC="${COMMAND}"
+	fi
+}
+
 #--- cfg_mac()
 ##
 ## This sets the MAC address for the given device
@@ -1424,14 +1454,13 @@
 ## @External  dialog
 #---
 function cfg_mac() {
-	COMMAND=`$DIALOG --backtitle "$BACKTITLE"                   \
-	                 --stdout                                   \
-	                 --title "Configure the MAC address"        \
-	                 --ok-label       "$BTN_ACCEPT"             \
-	                 --cancel-label   "$BTN_CANCEL"             \
-	                 --inputbox                                 \
-	                 "Enter the MAC address you want this device to use
-(usually not required, sometimes not even supported)" \
+	COMMAND=`$DIALOG --backtitle "$BACKTITLE"         \
+	                 --stdout                         \
+	                 --title "Configure MAC address"  \
+	                 --ok-label       "$BTN_ACCEPT"   \
+	                 --cancel-label   "$BTN_CANCEL"   \
+	                 --inputbox                       \
+	                 "Enter the MAC address you want this device to use. (Usually not required, sometimes not even supported.)" \
 	                 0 0 ${MAC}`
 
 	if [ $? -eq 0 ]; then
@@ -1455,8 +1484,7 @@
                      --ok-label       "$BTN_ACCEPT"             \
                      --cancel-label   "$BTN_CANCEL"             \
                      --inputbox                                 \
-                     "Enter the name of the device this device depends on
-(usually not required, usefull in case you're setting up things like VPN connections" \
+                     "Enter the name of the device this device depends on. (Usually not required, useful in case you're setting up things like VPN connections.)" \
                      0 0 ${NEEDS}`
 
     if [ $? -eq 0 ]; then
@@ -1479,9 +1507,7 @@
 	                 --ok-label       "$BTN_ACCEPT"             \
 	                 --cancel-label   "$BTN_CANCEL"             \
 	                 --inputbox                                 \
-	                 "Enter the custom options you need for this device.
-Everything you enter here is passed straight to ifconfig.
-(please file a bug to get missing options added)" \
+	                 "Enter the custom options you need for this device. Everything you enter here is passed straight to ifconfig. (Please file a bug to get missing options added.)" \
 	                 0 0 "${CUSTOM}"`
 
 	if [ $? -eq 0 ]; then
@@ -1528,10 +1554,10 @@
 	devname=$(get_basename $1 .dev)
 
 	# confirm removal of network device
-	COMMAND=`$DIALOG --backtitle "$BACKTITLE"                              \
-	                 --stdout                                              \
-	                 --title "Confirm device removal"                      \
-	                 --yesno                                               \
+	COMMAND=`$DIALOG --backtitle "$BACKTITLE"         \
+	                 --stdout                         \
+	                 --title "Confirm remove device"  \
+	                 --yesno                          \
 	                 "Are you sure you want to remove device file: ${devname}?" \
 	                 0 0`
 
@@ -1568,11 +1594,11 @@
 	local devname
 	devname=$(get_basename $1)
 
-	COMMAND=`$DIALOG --backtitle "$BACKTITLE"                                  \
-	                 --stdout                                                  \
-	                 --title "Confirm device saving"                           \
-	                 --yesno                                                   \
-	                 "Are you sure you want to save device file: ${devname}?"  \
+	COMMAND=`$DIALOG --backtitle "$BACKTITLE"       \
+	                 --stdout                       \
+	                 --title "Confirm save device"  \
+	                 --yesno                        \
+	                 "Are you sure you want to save device file: ${devname}?" \
 	                 0 0`
 
 	if [ $? -eq 0 ]; then
@@ -1614,6 +1640,7 @@
 ## @Global    WIFI_KEY3: wifi encryption key 3.<br>
 ## @Global    WIFI_KEY4: wifi encryption key 4.<br>
 ## @Global    WIFI_DEFAULTKEY: wifi encryption default key.<br>
+## @Global    DEVICE_MAC: device's MAC address.<br>
 ## @Global    MAC: MAC address.<br>
 ## @Global    CUSTOM: any custom options.<br>
 ## @Global    UP_ON_BOOT: 'no' if device should not be brought up on boot.<br>
@@ -1677,6 +1704,9 @@
 	if [ ! -z $WIFI_DEFAULTKEY ]; then
 		echo "WIFI_DEFAULTKEY=$WIFI_DEFAULTKEY" >> $1
 	fi
+	if [ ! -z ${DEVICE_MAC} ]; then
+		echo "DEVICE_MAC='${DEVICE_MAC}'" >> $1
+	fi
 	if [ ! -z ${MAC} ]; then
 		echo "MAC='${MAC}'" >> $1
 	fi
@@ -1719,6 +1749,7 @@
 ## @Global    WIFI_KEY3: wifi encryption key 3.<br>
 ## @Global    WIFI_KEY4: wifi encryption key 4.<br>
 ## @Global    WIFI_DEFAULTKEY: wifi encryption default key.<br>
+## @Global    DEVICE_MAC: device's MAC address.<br>
 ## @Global    MAC: MAC address.<br>
 ## @Global    CUSTOM: any custom options.<br>
 ## @Global    UP_ON_BOOT: 'no' if device should not be brought up on boot.<br>
@@ -1801,6 +1832,11 @@
 	else
 	  sed -i '/^WIFI_DEFAULTKEY=.*/d' $1
 	fi
+	if [ ! -z ${DEVICE_MAC} ]; then
+	  cat_or_sedit "^DEVICE_MAC=.*" "DEVICE_MAC='${DEVICE_MAC}'" $1
+	else
+	  sed -i '/^DEVICE_MAC=.*/d' $1
+	fi
 	if [ ! -z ${MAC} ]; then
 	  cat_or_sedit "^MAC=.*" "MAC='${MAC}'" $1
 	else
@@ -1861,7 +1897,7 @@
 	                 --ok-label       "$BTN_ACCEPT"                            \
 	                 --cancel-label   "$BTN_CANCEL"                            \
 	                 --inputbox                                                \
-	                 "Enter the name for this device (e.g. eth0, plip1)"       \
+	                 "Enter the name for this device. (Examples: eth0, plip1.)"       \
 	                 0 0`
 
 	if [ $? != 0 ]; then
@@ -1900,6 +1936,7 @@
 ## @Global    WIFI_MODE: wifi card mode.<br>
 ## @Global    WIFI_SECMODE: wifi security mode.<br>
 ## @Global    WIFI_ENCKEY: wifi encryption key.<br>
+## @Global    DEVICE_MAC: device's MAC address.<br>
 ## @Global    MAC: MAC address.<br>
 ## @Global    CUSTOM: any custom options.<br>
 ## @Global    UP_ON_BOOT: 'no' if device should not be brought up on boot.<br>
@@ -1943,17 +1980,18 @@
 			MODE=dynamic_set_hostname
 			COMMAND=`$DIALOG --backtitle "$BACKTITLE"                          \
 			                 --stdout                                          \
-		                     --title "Modify, Remove Network Device"           \
+		                     --title "Modify, remove network device"           \
 			                 --ok-label       "$BTN_SELECT"                    \
 			                 --cancel-label   "$BTN_BACK"                      \
 			                 --menu                                            \
-			                 "Choose a setting to modify, or select Remove to remove the device" \
+			                 "Choose a setting to modify, or select 'Remove' to remove the device." \
 			                 0 0 0                                             \
 			                 "MODULE" "${dmodule}"                             \
 			                 "MODE" "dynamic (use dhcp)"                       \
 			                 "POINTOPOINT" "${dpointopoint}"                   \
 			                 "MTU"  "${dmtu}"                                  \
 			                 "WIFI"  "Wifi menu"                               \
+			                 "DEVICE_MAC"  "${DEVICE_MAC}"                                   \
 			                 "MAC"  "${MAC}"                                   \
 			                 "CUSTOM"  "Custom options"                        \
 			                 "UP_ON_BOOT" "${UP_ON_BOOT}"                      \
@@ -1964,17 +2002,18 @@
  			'dynamic_set_hostname' | 'dynamic_get_hostname' )
 			COMMAND=`$DIALOG --backtitle "$BACKTITLE"                          \
 			                 --stdout                                          \
-		                     --title "Modify, Remove Network Device"           \
+		                     --title "Modify, remove network device"           \
 			                 --ok-label       "$BTN_SELECT"                    \
 			                 --cancel-label   "$BTN_BACK"                      \
 			                 --menu                                            \
-			                 "Choose a setting to modify, or select Remove to remove the device" \
+			                 "Choose a setting to modify, or select 'Remove' to remove the device." \
 			                 0 0 0                                             \
 			                 "MODULE" "${dmodule}"                             \
 			                 "MODE" "dynamic (use dhcp)"                       \
 			                 "POINTOPOINT" "${dpointopoint}"                   \
 			                 "MTU"  "${dmtu}"                                  \
 			                 "WIFI"  "Wifi menu"                               \
+			                 "DEVICE_MAC"  "${DEVICE_MAC}"                                   \
 			                 "MAC"  "${MAC}"                                   \
 			                 "CUSTOM"  "Custom options"                        \
 			                 "UP_ON_BOOT" "${UP_ON_BOOT}"                      \
@@ -1985,11 +2024,11 @@
 		static )
 			COMMAND=`$DIALOG --backtitle "$BACKTITLE"                          \
 			                 --stdout                                          \
-		                     --title "Modify, Remove Network Device"               \
+		                     --title "Modify, remove network device"               \
 			                 --ok-label       "$BTN_SELECT"                    \
 			                 --cancel-label   "$BTN_BACK"                      \
 			                 --menu                                            \
-			                 "Choose a setting to modify, or select Remove to remove the device" \
+			                 "Choose a setting to modify, or select 'Remove' to remove the device." \
 			                 0 0 0                                             \
 			                 "MODULE" "${dmodule}"                             \
 			                 "MODE" "static"                                   \
@@ -2000,6 +2039,7 @@
 			                 "POINTOPOINT" "${dpointopoint}"                   \
 			                 "MTU"  "${dmtu}"                                  \
 			                 "WIFI"  "Wifi submenu"                            \
+			                 "DEVICE_MAC"  "${DEVICE_MAC}"                                   \
 			                 "MAC"  "${MAC}"                                     \
 			                 "CUSTOM"  "Custom options"                        \
 			                 "UP_ON_BOOT" "${UP_ON_BOOT}"                      \
@@ -2024,6 +2064,7 @@
 			'POINTOPOINT') cfg_pointopoint     ;;
 			'MTU')         cfg_mtu             ;;
 			'WIFI')        cfg_wifi            ;;
+			'DEVICE_MAC')  cfg_device_mac      ;;
 			'MAC')         cfg_mac             ;;
 			'CUSTOM')      cfg_custom          ;;
 			'UP_ON_BOOT')  toggle_boot         ;;
@@ -2104,11 +2145,11 @@
 
 		COMMAND=`$DIALOG --backtitle "$BACKTITLE"                               \
 		                 --stdout                                               \
-		                 --title "Add, Modify, Remove Network Devices"          \
+		                 --title "Add, modify, remove network devices"          \
 		                 --ok-label       "$BTN_SELECT"                         \
 		                 --cancel-label   "$BTN_EXIT"                           \
 		                 --menu                                                 \
-		                 "Choose a device to modify or remove, or select Add to add a new device. Change will allow you to change the hostname of this computer." \
+		                 "Choose a device to modify or remove, or select 'Add' to add a new device. 'Hostname' will allow you to change the hostname of this computer." \
 		                 0 0 0                                                  \
 		                 ${NETDEVSMENU[*]}                                      \
 		                 "Add" "Add new network device"                         \



More information about the SM-Commit mailing list