diff options
author | dteske <dteske@FreeBSD.org> | 2013-06-19 18:13:58 +0000 |
---|---|---|
committer | dteske <dteske@FreeBSD.org> | 2013-06-19 18:13:58 +0000 |
commit | 9bd5d55beb4271698463d057610c2cafbf90b068 (patch) | |
tree | 9608cb05f7a098f9d30fc3a49ff7c526aeb27989 /usr.sbin | |
parent | c3cd626b8a5e75076a3e00f8f02f707a70ce17d2 (diff) | |
download | FreeBSD-src-9bd5d55beb4271698463d057610c2cafbf90b068.zip FreeBSD-src-9bd5d55beb4271698463d057610c2cafbf90b068.tar.gz |
Whitespace and comments.
Diffstat (limited to 'usr.sbin')
-rwxr-xr-x | usr.sbin/bsdconfig/bsdconfig | 3 | ||||
-rwxr-xr-x | usr.sbin/bsdconfig/password/password | 3 | ||||
-rwxr-xr-x | usr.sbin/bsdconfig/security/security | 4 | ||||
-rwxr-xr-x | usr.sbin/bsdconfig/startup/rcconf | 4 | ||||
-rwxr-xr-x | usr.sbin/bsdconfig/startup/rcedit | 3 | ||||
-rwxr-xr-x | usr.sbin/bsdconfig/usermgmt/userinput | 1 |
6 files changed, 10 insertions, 8 deletions
diff --git a/usr.sbin/bsdconfig/bsdconfig b/usr.sbin/bsdconfig/bsdconfig index d02afe1..fb728f7 100755 --- a/usr.sbin/bsdconfig/bsdconfig +++ b/usr.sbin/bsdconfig/bsdconfig @@ -180,8 +180,7 @@ dialog_menu_main() case "$menu_program" in /*) : already fully qualified ;; - *) - menu_program="$menuitem/$menu_program" + *) menu_program="$menuitem/$menu_program" esac f_shell_escape "$menu_title" menu_title diff --git a/usr.sbin/bsdconfig/password/password b/usr.sbin/bsdconfig/password/password index e7c3180..937e07a 100755 --- a/usr.sbin/bsdconfig/password/password +++ b/usr.sbin/bsdconfig/password/password @@ -69,6 +69,9 @@ f_dialog_title "$msg_root_password" f_dialog_backtitle "${ipgm:+bsdconfig }$pgm" f_mustberoot_init +# +# Prompt the user to input a new password (and change it if they don't cancel) +# if f_dialog_input_password; then err=$( echo "$pw_password" | pw usermod $USER_ROOT -h 0 2>&1 ) || f_die $? "%s" "$err" diff --git a/usr.sbin/bsdconfig/security/security b/usr.sbin/bsdconfig/security/security index b593deb..d267535 100755 --- a/usr.sbin/bsdconfig/security/security +++ b/usr.sbin/bsdconfig/security/security @@ -162,9 +162,9 @@ while :; do "2 ["?"] $msg_securelevel") # Configure securelevels for the system $BSDCFG_LIBE/$APP_DIR/kern_securelevel ${USE_XDIALOG:+-X} ;; "3 [X] $msg_nfs_port") # Require that NFS clients use reserved ports - f_sysrc_set nfs_reserved_port_only "NO";; + f_sysrc_set nfs_reserved_port_only "NO" ;; "3 [ ] $msg_nfs_port") # Same; Toggle value - f_sysrc_set nfs_reserved_port_only "YES";; + f_sysrc_set nfs_reserved_port_only "YES" ;; esac done diff --git a/usr.sbin/bsdconfig/startup/rcconf b/usr.sbin/bsdconfig/startup/rcconf index 050e2d8..d0bf656 100755 --- a/usr.sbin/bsdconfig/startup/rcconf +++ b/usr.sbin/bsdconfig/startup/rcconf @@ -246,9 +246,7 @@ while :; do case "$mtag" in "X $msg_exit") break ;; - "> $msg_add_new") - $BSDCFG_LIBE/$APP_DIR/rcadd ${USE_XDIALOG:+-X} - ;; + "> $msg_add_new") $BSDCFG_LIBE/$APP_DIR/rcadd ${USE_XDIALOG:+-X} ;; "> $msg_delete") # rcdelete has a similar interface that can inherit the below: export SHOW_VALUE SHOW_DESC SHOW_DEFAULT_VALUE SHOW_CONFIGURED diff --git a/usr.sbin/bsdconfig/startup/rcedit b/usr.sbin/bsdconfig/startup/rcedit index 4dea4dc..290b215 100755 --- a/usr.sbin/bsdconfig/startup/rcedit +++ b/usr.sbin/bsdconfig/startup/rcedit @@ -62,6 +62,9 @@ shift $(( $OPTIND - 1 )) f_dialog_backtitle "${ipgm:+bsdconfig }$pgm" f_mustberoot_init +# +# Edit the rc.conf(5) variable(s) passed as argument(s) +# f_dialog_rcedit "$@" ################################################################################ diff --git a/usr.sbin/bsdconfig/usermgmt/userinput b/usr.sbin/bsdconfig/usermgmt/userinput index 21e61f6..2be62cf 100755 --- a/usr.sbin/bsdconfig/usermgmt/userinput +++ b/usr.sbin/bsdconfig/usermgmt/userinput @@ -530,7 +530,6 @@ while :; do esac ;; esac - done exit $SUCCESS |