tazinst diff installer.cgi @ rev 28
fix #109 grub install fails
author | Dominique Corbex <domcox@slitaz.org> |
---|---|
date | Wed Feb 12 22:46:05 2014 +0100 (2014-02-12) |
parents | df9c8e8bab7f |
children | a0bb82fa1e38 |
line diff
1.1 --- a/installer.cgi Tue Jan 07 21:42:05 2014 +0100 1.2 +++ b/installer.cgi Wed Feb 12 22:46:05 2014 +0100 1.3 @@ -11,7 +11,7 @@ 1.4 # restricted path 1.5 PATH="/usr/sbin:/usr/bin:/sbin:/bin" 1.6 1.7 -VERSION=3.94 1.8 +VERSION=3.95 1.9 1.10 # Common functions from libtazpanel 1.11 . lib/libtazpanel 1.12 @@ -263,10 +263,10 @@ 1.13 select "$(/usr/sbin/tazinst list uuid "$INSTFILE")" \ 1.14 "$root_uuid" \ 1.15 "ROOT_UUID" \ 1.16 - 2 1.17 + 0 1.18 error_msg "$error" \ 1.19 "root_uuid" \ 1.20 - 2 1.21 + 0 1.22 br 1.23 } 1.24 1.25 @@ -295,7 +295,7 @@ 1.26 select "$(/usr/sbin/tazinst list uuid "$INSTFILE")" \ 1.27 "$home_uuid" \ 1.28 "HOME_UUID" \ 1.29 - 2 1.30 + 0 1.31 br 1.32 } 1.33 1.34 @@ -421,7 +421,7 @@ 1.35 { 1.36 if [ "$CHECK" ]; then 1.37 echo '<span class="alert">' 1.38 - p $(gettext "Errors found. Please check your settings.") 1.39 + p "$(gettext "Errors found. Please check your settings.")" 1.40 echo '</span>' 1.41 fi 1.42 } 1.43 @@ -1051,8 +1051,9 @@ 1.44 if ! (/usr/sbin/tazinst check all $INSTFILE > /dev/null); then 1.45 page_redirection "input&CHECK=yes" 1.46 else 1.47 - tazinst_run && moveto_page home reboot \ 1.48 - || moveto_page input failed 1.49 +# tazinst_run && moveto_page home reboot \ 1.50 +# || moveto_page input failed 1.51 + moveto_page input failed 1.52 fi 1.53 form_end 1.54 ;;