Date: Wed, 19 Jun 2013 18:13:59 +0000 (UTC) From: Devin Teske <dteske@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r252000 - in head/usr.sbin/bsdconfig: . password security startup usermgmt Message-ID: <201306191813.r5JIDxS4019392@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dteske Date: Wed Jun 19 18:13:58 2013 New Revision: 252000 URL: http://svnweb.freebsd.org/changeset/base/252000 Log: Whitespace and comments. Modified: head/usr.sbin/bsdconfig/bsdconfig head/usr.sbin/bsdconfig/password/password head/usr.sbin/bsdconfig/security/security head/usr.sbin/bsdconfig/startup/rcconf head/usr.sbin/bsdconfig/startup/rcedit head/usr.sbin/bsdconfig/usermgmt/userinput Modified: head/usr.sbin/bsdconfig/bsdconfig ============================================================================== --- head/usr.sbin/bsdconfig/bsdconfig Wed Jun 19 18:01:37 2013 (r251999) +++ head/usr.sbin/bsdconfig/bsdconfig Wed Jun 19 18:13:58 2013 (r252000) @@ -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 Modified: head/usr.sbin/bsdconfig/password/password ============================================================================== --- head/usr.sbin/bsdconfig/password/password Wed Jun 19 18:01:37 2013 (r251999) +++ head/usr.sbin/bsdconfig/password/password Wed Jun 19 18:13:58 2013 (r252000) @@ -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" Modified: head/usr.sbin/bsdconfig/security/security ============================================================================== --- head/usr.sbin/bsdconfig/security/security Wed Jun 19 18:01:37 2013 (r251999) +++ head/usr.sbin/bsdconfig/security/security Wed Jun 19 18:13:58 2013 (r252000) @@ -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 Modified: head/usr.sbin/bsdconfig/startup/rcconf ============================================================================== --- head/usr.sbin/bsdconfig/startup/rcconf Wed Jun 19 18:01:37 2013 (r251999) +++ head/usr.sbin/bsdconfig/startup/rcconf Wed Jun 19 18:13:58 2013 (r252000) @@ -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 Modified: head/usr.sbin/bsdconfig/startup/rcedit ============================================================================== --- head/usr.sbin/bsdconfig/startup/rcedit Wed Jun 19 18:01:37 2013 (r251999) +++ head/usr.sbin/bsdconfig/startup/rcedit Wed Jun 19 18:13:58 2013 (r252000) @@ -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 "$@" ################################################################################ Modified: head/usr.sbin/bsdconfig/usermgmt/userinput ============================================================================== --- head/usr.sbin/bsdconfig/usermgmt/userinput Wed Jun 19 18:01:37 2013 (r251999) +++ head/usr.sbin/bsdconfig/usermgmt/userinput Wed Jun 19 18:13:58 2013 (r252000) @@ -530,7 +530,6 @@ while :; do esac ;; esac - done exit $SUCCESS
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306191813.r5JIDxS4019392>