Unified · Split
| @@ -627,15 +627,15 @@ set_hostname() { · 626 unmodified lines | |||
| 627 | } | 627 | } |
| 628 | 628 | ||
| 629 | menu_rootpassword() { | 629 | menu_rootpassword() { |
| 630 | local _firstpass _secondpass _desc | 630 | local _firstpass _secondpass _again _desc |
| 631 | 631 | ||
| 632 | while true; do | 632 | while true; do |
| 633 | if [ -z "${_firstpass}" ]; then | 633 | if [ -z "${_firstpass}" ]; then |
| 634 | _desc="Enter the root password" | 634 | _desc="Enter the root password" |
| 635 | else | 635 | else |
| 636 | _desc="$_desc again" | 636 | _again=" again" |
| 637 | fi | 637 | fi |
| 638 | DIALOG --insecure --passwordbox "${_desc}" ${INPUTSIZE} | 638 | DIALOG --insecure --passwordbox "${_desc}${_again}" ${INPUTSIZE} |
| 639 | if [ $? -eq 0 ]; then | 639 | if [ $? -eq 0 ]; then |
| 640 | if [ -z "${_firstpass}" ]; then | 640 | if [ -z "${_firstpass}" ]; then |
| 641 | _firstpass="$(cat $ANSWER)" | 641 | _firstpass="$(cat $ANSWER)" |
| @@ -663,7 +663,7 @@ set_rootpassword() { · 21 unmodified lines | |||
| 663 | } | 663 | } |
| 664 | 664 | ||
| 665 | menu_useraccount() { | 665 | menu_useraccount() { |
| 666 | local _firstpass _secondpass _desc | 666 | local _firstpass _secondpass _desc _again |
| 667 | local _groups _status _group _checklist | 667 | local _groups _status _group _checklist |
| 668 | local _preset | 668 | local _preset |
| 669 | 669 | ||
| @@ -698,9 +698,9 @@ menu_useraccount() { · 28 unmodified lines | |||
| 698 | if [ -z "${_firstpass}" ]; then | 698 | if [ -z "${_firstpass}" ]; then |
| 699 | _desc="Enter the password for login '$(get_option USERLOGIN)'" | 699 | _desc="Enter the password for login '$(get_option USERLOGIN)'" |
| 700 | else | 700 | else |
| 701 | _desc="$_desc again" | 701 | _again=" again" |
| 702 | fi | 702 | fi |
| 703 | DIALOG --insecure --passwordbox "${_desc}" ${INPUTSIZE} | 703 | DIALOG --insecure --passwordbox "${_desc}${_again}" ${INPUTSIZE} |
| 704 | if [ $? -eq 0 ]; then | 704 | if [ $? -eq 0 ]; then |
| 705 | if [ -z "${_firstpass}" ]; then | 705 | if [ -z "${_firstpass}" ]; then |
| 706 | _firstpass="$(cat $ANSWER)" | 706 | _firstpass="$(cat $ANSWER)" |