diff options
| author | dteske <dteske@FreeBSD.org> | 2012-09-21 19:03:25 +0000 |
|---|---|---|
| committer | dteske <dteske@FreeBSD.org> | 2012-09-21 19:03:25 +0000 |
| commit | 5bd90f70aeb197b19ce714af4c1a59070b9dc689 (patch) | |
| tree | d041ecdde663dcb11b07368b0990746b6b9decd7 /usr.sbin/bsdconfig/share/mustberoot.subr | |
| parent | be9906f96c7ede292408ef02eae1e83ce8646c13 (diff) | |
| download | FreeBSD-src-5bd90f70aeb197b19ce714af4c1a59070b9dc689.zip FreeBSD-src-5bd90f70aeb197b19ce714af4c1a59070b9dc689.tar.gz | |
Reverse SVN r240770 -- jilles@ made a suggestion that allowed us to redesign
our embedded rescue environment to support /dev/null making r240770 obsolete.
Reviewed by: jilles, adrian (co-mentor)
Approved by: jilles, adrian (co-mentor)
Diffstat (limited to 'usr.sbin/bsdconfig/share/mustberoot.subr')
| -rw-r--r-- | usr.sbin/bsdconfig/share/mustberoot.subr | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/bsdconfig/share/mustberoot.subr b/usr.sbin/bsdconfig/share/mustberoot.subr index 234724e..c6514c0 100644 --- a/usr.sbin/bsdconfig/share/mustberoot.subr +++ b/usr.sbin/bsdconfig/share/mustberoot.subr @@ -85,7 +85,7 @@ f_become_root_via_sudo() # # Check sudo(8) access before prompting for password. # - :| sudo -S -v 2>&- + :| sudo -S -v 2> /dev/null if [ $? -ne $SUCCESS ]; then # # sudo(8) access denied. Prompt for their password. @@ -112,7 +112,7 @@ f_become_root_via_sudo() --ok-label "$msg_ok" \ --cancel-label "$msg_cancel" \ --password --inputbox "$msg" $size \ - 2>&1 >&- ) + 2>&1 > /dev/null ) retval=$? # Catch X11-related errors @@ -141,7 +141,7 @@ f_become_root_via_sudo() # # Validate sudo(8) credentials # - sudo -S -v 2>&- <<-EOF + sudo -S -v 2> /dev/null <<-EOF $password EOF retval=$? @@ -186,7 +186,7 @@ f_become_root_via_sudo() displaynum="${DISPLAY#*:}" xauth -f ~/.Xauthority extract - $HOSTNAME/unix:$displaynum \ $HOSTNAME:$displaynum | sudo sh -c 'xauth -ivf \ - ~root/.Xauthority merge - >&- 2>&-' + ~root/.Xauthority merge - > /dev/null 2>&1' fi # Re-execute ourselves with sudo(8) @@ -254,7 +254,7 @@ f_authenticate_some_user() $height $width \ "$field_username" "" \ "$field_password" "" \ - 2>&1 >&- ) + 2>&1 > /dev/null ) retval=$? # Catch X11-related errors @@ -302,7 +302,7 @@ f_authenticate_some_user() su -m "$user" <<-EOF sh <<EOS sudo -k - sudo -S -v 2>&- <<EOP + sudo -S -v 2> /dev/null <<EOP $password EOP EOS |
