summaryrefslogtreecommitdiffstats
path: root/usr.sbin/bsdconfig/share/media
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/bsdconfig/share/media')
-rw-r--r--usr.sbin/bsdconfig/share/media/any.subr5
-rw-r--r--usr.sbin/bsdconfig/share/media/cdrom.subr2
-rw-r--r--usr.sbin/bsdconfig/share/media/common.subr2
-rw-r--r--usr.sbin/bsdconfig/share/media/dos.subr2
-rw-r--r--usr.sbin/bsdconfig/share/media/floppy.subr2
-rw-r--r--usr.sbin/bsdconfig/share/media/ftp.subr6
-rw-r--r--usr.sbin/bsdconfig/share/media/http.subr4
-rw-r--r--usr.sbin/bsdconfig/share/media/nfs.subr2
-rw-r--r--usr.sbin/bsdconfig/share/media/options.subr5
-rw-r--r--usr.sbin/bsdconfig/share/media/tcpip.subr39
-rw-r--r--usr.sbin/bsdconfig/share/media/ufs.subr2
-rw-r--r--usr.sbin/bsdconfig/share/media/usb.subr2
12 files changed, 34 insertions, 39 deletions
diff --git a/usr.sbin/bsdconfig/share/media/any.subr b/usr.sbin/bsdconfig/share/media/any.subr
index 3675713..516d2d2 100644
--- a/usr.sbin/bsdconfig/share/media/any.subr
+++ b/usr.sbin/bsdconfig/share/media/any.subr
@@ -113,11 +113,10 @@ f_media_get_type()
f_dialog_data_sanitize mtag
f_dprintf "retval=%s mtag=[%s]" $retval "$mtag"
- if [ $retval -eq 2 ]; then
- # The Help button was pressed
+ if [ $retval -eq $DIALOG_HELP ]; then
f_show_help "$MEDIA_HELPFILE"
continue
- elif [ $retval -ne 0 ]; then
+ elif [ $retval -ne $DIALOG_OK ]; then
return $FAILURE
fi
diff --git a/usr.sbin/bsdconfig/share/media/cdrom.subr b/usr.sbin/bsdconfig/share/media/cdrom.subr
index cd68029..c59f88a 100644
--- a/usr.sbin/bsdconfig/share/media/cdrom.subr
+++ b/usr.sbin/bsdconfig/share/media/cdrom.subr
@@ -170,7 +170,7 @@ f_media_shutdown_cdrom()
{
local dev="$1" err
- [ "$CDROM_MOUNTED" ] || return
+ [ "$CDROM_MOUNTED" ] || return $FAILURE
if [ "$CDROM_PREVIOUSLY_MOUNTED" ]; then
CDROM_MOUNTED=
diff --git a/usr.sbin/bsdconfig/share/media/common.subr b/usr.sbin/bsdconfig/share/media/common.subr
index 495aca7..01d50a1 100644
--- a/usr.sbin/bsdconfig/share/media/common.subr
+++ b/usr.sbin/bsdconfig/share/media/common.subr
@@ -127,7 +127,7 @@ f_media_generic_get()
fi
[ "$probe_type" ] && return $SUCCESS
cat "$path"
- return
+ return $?
fi
done
diff --git a/usr.sbin/bsdconfig/share/media/dos.subr b/usr.sbin/bsdconfig/share/media/dos.subr
index 440c5c9..be4cfc7 100644
--- a/usr.sbin/bsdconfig/share/media/dos.subr
+++ b/usr.sbin/bsdconfig/share/media/dos.subr
@@ -148,7 +148,7 @@ f_media_shutdown_dos()
{
local dev="$1" err
- [ "$DOS_MOUNTED" ] || return
+ [ "$DOS_MOUNTED" ] || return $FAILURE
if ! err=$( umount -f "$MOUNTPOINT" 2>&1 ); then
err="${err#umount: }"; err="${err#*: }"
diff --git a/usr.sbin/bsdconfig/share/media/floppy.subr b/usr.sbin/bsdconfig/share/media/floppy.subr
index eb6bc5e..62fe64b 100644
--- a/usr.sbin/bsdconfig/share/media/floppy.subr
+++ b/usr.sbin/bsdconfig/share/media/floppy.subr
@@ -205,7 +205,7 @@ f_media_shutdown_floppy()
{
local dev="$1" err mp
- [ "$FLOPPY_MOUNTED" ] || return
+ [ "$FLOPPY_MOUNTED" ] || return $FAILURE
device_$dev get private mp
if ! err=$( umount -f "${mp:=$MOUNTPOINT}" 2>&1 ); then
diff --git a/usr.sbin/bsdconfig/share/media/ftp.subr b/usr.sbin/bsdconfig/share/media/ftp.subr
index 5aad8ee..d7f33bb 100644
--- a/usr.sbin/bsdconfig/share/media/ftp.subr
+++ b/usr.sbin/bsdconfig/share/media/ftp.subr
@@ -213,7 +213,7 @@ f_dialog_menu_media_ftp()
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
- ) || return $FAILURE
+ ) || return $DIALOG_CANCEL
f_dialog_data_sanitize mtag
case "$mtag" in
@@ -224,7 +224,7 @@ f_dialog_menu_media_ftp()
setvar $VAR_FTP_PATH "ftp://$value"
esac
- return $SUCCESS
+ return $DIALOG_OK
}
# f_media_set_ftp
@@ -740,7 +740,7 @@ f_media_init_ftp()
else
f_yesno "$msg_cant_find_distribution" \
"$rel" "$ftp_host"
- if [ $? -eq $SUCCESS ]; then
+ if [ $? -eq $DIALOG_OK ]; then
unset $VAR_FTP_PATH
f_media_set_ftp && continue
fi
diff --git a/usr.sbin/bsdconfig/share/media/http.subr b/usr.sbin/bsdconfig/share/media/http.subr
index 984d771..97c4ed0 100644
--- a/usr.sbin/bsdconfig/share/media/http.subr
+++ b/usr.sbin/bsdconfig/share/media/http.subr
@@ -101,7 +101,7 @@ f_dialog_menu_media_http()
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
- ) || return $FAILURE
+ ) || return $DIALOG_CANCEL
f_dialog_data_sanitize mtag
case "$mtag" in
@@ -112,7 +112,7 @@ f_dialog_menu_media_http()
setvar $VAR_HTTP_PATH "http://$value"
esac
- return $SUCCESS
+ return $DIALOG_OK
}
# f_media_set_http
diff --git a/usr.sbin/bsdconfig/share/media/nfs.subr b/usr.sbin/bsdconfig/share/media/nfs.subr
index 9ce0467..8db5a06 100644
--- a/usr.sbin/bsdconfig/share/media/nfs.subr
+++ b/usr.sbin/bsdconfig/share/media/nfs.subr
@@ -233,7 +233,7 @@ f_media_shutdown_nfs()
{
local dev="$1" err
- [ "$NFS_MOUNTED" ] || return
+ [ "$NFS_MOUNTED" ] || return $FAILURE
f_dprintf "Unmounting NFS partition on %s" "$MOUNTPOINT"
if ! err=$( umount -f "$MOUNTPOINT" 2>&1 ); then
diff --git a/usr.sbin/bsdconfig/share/media/options.subr b/usr.sbin/bsdconfig/share/media/options.subr
index 3f71a96..bc9568e 100644
--- a/usr.sbin/bsdconfig/share/media/options.subr
+++ b/usr.sbin/bsdconfig/share/media/options.subr
@@ -224,11 +224,10 @@ f_media_options_menu()
defaultitem="$mtag"
f_dprintf "retval=%s mtag=[%s]" $retval "$mtag"
- if [ $retval -eq 2 ]; then
- # The Help button was pressed
+ if [ $retval -eq $DIALOG_HELP ]; then
f_show_help "$OPTIONS_HELPFILE"
continue
- elif [ $retval -ne 0 ]; then
+ elif [ $retval -ne $DIALOG_OK ]; then
break # to success
fi
diff --git a/usr.sbin/bsdconfig/share/media/tcpip.subr b/usr.sbin/bsdconfig/share/media/tcpip.subr
index 6b4791e..5957b90 100644
--- a/usr.sbin/bsdconfig/share/media/tcpip.subr
+++ b/usr.sbin/bsdconfig/share/media/tcpip.subr
@@ -471,10 +471,10 @@ f_dialog_validate_tcpip()
! f_validate_gateway "$gateway" "$ipaddr" "$netmask"; then
f_show_msg "$msg_invalid_gateway_ipv4_address_specified"
else
- return $SUCCESS
+ return $DIALOG_OK
fi
- return $FAILURE
+ return $DIALOG_CANCEL
}
# f_ifconfig_inet $interface [$var_to_set]
@@ -1102,7 +1102,7 @@ f_device_dialog_tcp()
local use_dhcp="" use_rtsol=""
local _ipaddr _netmask _extras
- [ "$dev" ] || return $FAILURE
+ [ "$dev" ] || return $DIALOG_CANCEL
# Initialize vars from previous device values
local private
@@ -1125,7 +1125,6 @@ f_device_dialog_tcp()
unset $VAR_NONINTERACTIVE
fi
-
#
# Try a RTSOL scan if such behavior is desired.
# If the variable was configured and is YES, do it.
@@ -1321,7 +1320,7 @@ f_device_dialog_tcp()
if [ ! "$cp" ]; then
# User either chose "Cancel", pressed
# ESC, or blanked every form field
- return $FAILURE
+ return $DIALOG_CANCEL
else
n=$( echo "$cp" | f_number_of_lines )
[ $n -eq 1 ] && case "$cp" in HELP*)
@@ -1404,14 +1403,12 @@ f_device_dialog_tcp()
f_dialog_data_sanitize cp
f_dprintf "retval=%u mtag=[%s]" $retval "$cp"
- if [ $retval -eq 2 ]; then
- # The Help button was pressed
+ if [ $retval -eq $DIALOG_HELP ]; then
f_show_help "$TCP_HELPFILE"
continue
- elif [ $retval -ne 0 ]; then
- # User chose "Cancel" or pressed ESC
+ elif [ $retval -ne $DIALOG_OK ]; then
f_dialog_title_restore
- return $FAILURE
+ return $DIALOG_CANCEL
fi
case "$cp" in
@@ -1490,7 +1487,7 @@ f_device_dialog_tcp()
[ "$use_dhcp" ] ||
f_config_resolv # XXX this will do it on the MFS copy
- return $SUCCESS
+ return $DIALOG_OK
}
# f_device_scan_tcp [$var_to_set]
@@ -1586,15 +1583,15 @@ f_device_select_tcp()
if [ ${cnt:=0} -gt 0 ]; then
dev="${devs%%[$IFS]*}"
f_device_dialog_tcp $dev
- if [ $? -eq $SUCCESS ]; then
+ if [ $? -eq $DIALOG_OK ]; then
setvar $VAR_NETWORK_DEVICE $dev
- return $SUCCESS
+ return $DIALOG_OK
fi
fi
done
f_interactive && f_show_msg "$msg_no_network_devices"
- return $FAILURE
+ return $DIALOG_CANCEL
fi # $network_dev
@@ -1610,18 +1607,18 @@ f_device_select_tcp()
if f_dialog_yesno "$msg_assume_network_is_already_configured"
then
setvar $VAR_NETWORK_DEVICE $dev
- return $SUCCESS
+ return $DIALOG_OK
fi
fi
local retval=$SUCCESS
if [ ${cnt:=0} -eq 0 ]; then
f_show_msg "$msg_no_network_devices"
- retval=$FAILURE
+ retval=$DIALOG_CANCEL
elif [ $cnt -eq 1 ]; then
f_device_dialog_tcp $dev
retval=$?
- [ $retval -eq $SUCCESS ] && setvar $VAR_NETWORK_DEVICE $dev
+ [ $retval -eq $DIALOG_OK ] && setvar $VAR_NETWORK_DEVICE $dev
else
local title="$msg_network_interface_information_required"
local prompt="$msg_please_select_ethernet_device_to_configure"
@@ -1632,15 +1629,15 @@ f_device_select_tcp()
"$NETWORK_DEVICE_HELPFILE" \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD )
retval=$?
- [ "$dev" ] || return $FAILURE
+ [ "$dev" ] || return $DIALOG_CANCEL
f_device_find "$dev" $DEVICE_TYPE_NETWORK devs
- [ "$devs" ] || return $FAILURE
+ [ "$devs" ] || return $DIALOG_CANCEL
dev="${devs%%[$IFS]*}"
f_device_dialog_tcp $dev
retval=$?
- if [ $retval -eq $SUCCESS ]; then
+ if [ $retval -eq $DIALOG_OK ]; then
f_struct_copy device_$dev device_network
setvar $VAR_NETWORK_DEVICE network
else
@@ -1675,7 +1672,7 @@ f_dialog_menu_select_tcp()
"$name"
fi
fi
- return $SUCCESS
+ return $DIALOG_OK
}
############################################################ MAIN
diff --git a/usr.sbin/bsdconfig/share/media/ufs.subr b/usr.sbin/bsdconfig/share/media/ufs.subr
index cc63475..2de29b3 100644
--- a/usr.sbin/bsdconfig/share/media/ufs.subr
+++ b/usr.sbin/bsdconfig/share/media/ufs.subr
@@ -177,7 +177,7 @@ f_media_shutdown_ufs()
{
local dev="$1" err
- [ "$UFS_MOUNTED" ] || return
+ [ "$UFS_MOUNTED" ] || return $FAILURE
if ! err=$( umount -f "$MOUNTPOINT" 2>&1 ); then
err="${err#umount: }"; err="${err#*: }"
diff --git a/usr.sbin/bsdconfig/share/media/usb.subr b/usr.sbin/bsdconfig/share/media/usb.subr
index e345ae0..f7afc29 100644
--- a/usr.sbin/bsdconfig/share/media/usb.subr
+++ b/usr.sbin/bsdconfig/share/media/usb.subr
@@ -158,7 +158,7 @@ f_media_shutdown_usb()
{
local dev="$1" err
- [ "$USB_MOUNTED" ] || return
+ [ "$USB_MOUNTED" ] || return $FAILURE
if ! err=$( umount -f "$MOUNTPOINT" 2>&1 ); then
err="${err#umount: }"; err="${err#*: }"
OpenPOWER on IntegriCloud