July 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] <web-client> master : Taking MByte for memory
by Stefan Schubert 17 Jul '09

17 Jul '09

ref: refs/heads/master commit 954ab7c58ebaec0a3ff5715c56ece1e52ef6a539 Author: Stefan Schubert <schubi(a)suse.de> Date: Fri Jul 17 10:24:02 2009 +0200 Taking MByte for memory --- .../status/app/controllers/status_controller.rb | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/plugins/status/app/controllers/status_controller.rb b/plugins/status/app/controllers/status_controller.rb index 56faf55..f07b7c3 100644 --- a/plugins/status/app/controllers/status_controller.rb +++ b/plugins/status/app/controllers/status_controller.rb @@ -29,8 +29,8 @@ class StatusController < ApplicationController end data_list = create_data_map(branch, next_label) if data_list.size > 0 - @data[next_label] = data_list - data_list = [] + @data[next_label] = data_list + data_list = [] end end end @@ -63,8 +63,13 @@ class StatusController < ApplicationController @data.each do |key, list_value| if @limits.has_key?(key) graph_list = [] + key_split = key.split("/") for i in 0..list_value.size-1 do - graph_list << [i,@limits[key]["value"]] + if key_split.size>1 && key_split[1]=="memory" # take MByte for the value + graph_list << [i,@limits[key]["value"]/1024/1024] + else + graph_list << [i,@limits[key]["value"]] + end end @limits_list[key] = graph_list end @@ -119,7 +124,12 @@ class StatusController < ApplicationController end if params.has_key?(label+"/value") limit = Hash.new - limit["value"] = params[label+"/value"] + key_split = label.split("/") + if key_split.size>1 && key_split[1]=="memory" # MByte for the value --> change it to Byte + limit["value"] = params[label+"/value"].to_f*1024*1024 + else + limit["value"] = params[label+"/value"] + end limit["maximum"] = params[label+"/maximum"] == "true"?true:false status["limit"] = limit end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : fix concerning limits
by Stefan Schubert 17 Jul '09

17 Jul '09

ref: refs/heads/master commit f90bd649630a76cb31629c7bd99d0b1d0aeabea3 Author: Stefan Schubert <schubi(a)suse.de> Date: Fri Jul 17 10:23:16 2009 +0200 fix concerning limits --- plugins/status/app/models/status.rb | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/plugins/status/app/models/status.rb b/plugins/status/app/models/status.rb index 95136ea..a31ef24 100644 --- a/plugins/status/app/models/status.rb +++ b/plugins/status/app/models/status.rb @@ -164,7 +164,10 @@ class Status < ActiveRecord::Base #setting the limits result.each do |key, value| - path = rrdfile.chomp(".rrd") + "/" + key + + path = rrdfile.chomp(".rrd") + path +="/" + key if key!="value" #do not take care about the value flag + path = path.tr('-','_') if @limits.has_key?(path) result[key] ||= Hash.new result[key].merge!({"limit" => @limits[path] }) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r58099 - /trunk/theme/package/yast2-theme.changes
by jimmacfx＠svn.opensuse.org 16 Jul '09

16 Jul '09

Author: jimmacfx Date: Thu Jul 16 20:44:11 2009 New Revision: 58099 URL: http://svn.opensuse.org/viewcvs/yast?rev=58099&view=rev Log: without a changelog entry, nobody notices a theme change. Modified: trunk/theme/package/yast2-theme.changes Modified: trunk/theme/package/yast2-theme.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/package/yast2-theme.change… ============================================================================== --- trunk/theme/package/yast2-theme.changes (original) +++ trunk/theme/package/yast2-theme.changes Thu Jul 16 20:44:11 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jun 5 16:17:20 CET 2009 - jimmac(a)novell.com + +- initial revision of the 11.2 installer theme + +------------------------------------------------------------------- Mon Apr 27 10:17:16 CEST 2009 - locilka(a)suse.cz - Re-added the old YaST icon as 'yast-spanner'. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : Added jquery plugin for password input field
by Robert Lihm 16 Jul '09

16 Jul '09

ref: refs/heads/master commit b9a891efa0c7faa3f7103ef32b833406de360fea Author: Robert Lihm <rlihm(a)lihmedia.org> Date: Thu Jul 16 19:00:28 2009 +0200 Added jquery plugin for password input field --- webclient/public/javascripts/jQuery.dPassword.js | 177 ++++++++++++++++++++++ 1 files changed, 177 insertions(+), 0 deletions(-) diff --git a/webclient/public/javascripts/jQuery.dPassword.js b/webclient/public/javascripts/jQuery.dPassword.js new file mode 100644 index 0000000..48c3e9c --- /dev/null +++ b/webclient/public/javascripts/jQuery.dPassword.js @@ -0,0 +1,177 @@ +/******************************************************************************* + * dPassword v0.1 - jQuery delayed password masking (iPhone style) + * + * licensed under MIT License + * + * Copyright (c) 2009 DECAF°, Stefan Ullrich (http://decaf.de) + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Known Issues: - delete marked text will not work + * - deleting a single chars will not work if char is + * not the last char + * - view will not follow cursor if textfield is too small + * - if id based styles are assigned, these styles will + * not be taken over + * + *******************************************************************************/ + +(function($){ + $.fn.dPassword = function(options) { + + var defaults = { + interval: 200, + duration: 3000, + replacement: '%u25CF', + prefix: 'password_', + debug: false + } + + var opts = $.extend(defaults, options); + var checker = new Array(); + var timer = new Array(); + + $(this).each(function() { + if (opts.debug) console.log('init [' + $(this).attr('id') + ']'); + + // get original password tag values + var name = $(this).attr('name'); + var id = $(this).attr('id'); + var cssclass = $(this).attr('class'); + var style = $(this).attr('style'); + var size = $(this).attr('size'); + var maxlength = $(this).attr('maxlength'); + var disabled = $(this).attr('disabled'); + var tabindex = $(this).attr('tabindex'); + var accesskey = $(this).attr('accesskey'); + var value = $(this).attr('value'); + + // set timers + checker.push(id); + timer.push(id); + + // hide field + $(this).hide(); + + // add debug span + if (opts.debug) { + $(this).after('<span id="debug_' + opts.prefix + name + '" style="color: #f00;"></span>'); + } + // add new text field + $(this).after(' <input name="' + (opts.prefix + name) + '" ' + + 'id="' + (opts.prefix + id) + '" ' + + 'type="text" ' + + 'value="' + value + '" ' + + (cssclass != '' ? 'class="' + cssclass + '"' : '') + + (style != '' ? 'style="' + style + '"' : '') + + (size != '' ? 'size="' + size + '"' : '') + + (maxlength != -1 ? 'maxlength="' + maxlength + '"' : '') + + (disabled != '' ? 'disabled="' + disabled + '"' : '') + + (tabindex != '' ? 'tabindex="' + tabindex + '"' : '') + + (accesskey != undefined ? 'accesskey="' + accesskey + '"' : '') + + 'autocomplete="off" />'); + + // change label + $('label[for='+id+']').attr('for', opts.prefix + id); + // disable tabindex + $(this).attr('tabindex', ''); + // disable accesskey + $(this).attr('accesskey', ''); + + + // bind event + $('#' + opts.prefix + id).bind('focus', function(event) { + if (opts.debug) console.log('event: focus [' + getId($(this).attr('id')) + ']'); + clearTimeout(checker[getId($(this).attr('id'))]); + checker[getId($(this).attr('id'))] = setTimeout("check('" + getId($(this).attr('id')) + "', '')", opts.interval); + }); + $('#' + opts.prefix + id).bind('blur', function(event) { + if (opts.debug) console.log('event: blur [' + getId($(this).attr('id')) + ']'); + clearTimeout(checker[getId($(this).attr('id'))]); + }); + + setTimeout("check('" + id + "', '', true);", opts.interval); + }); + + getId = function(id) { + var pattern = opts.prefix+'(.*)'; + var regex = new RegExp(pattern); + regex.exec(id); + id = RegExp.$1; + + return id; + } + + setPassword = function(id, str) { + if (opts.debug) console.log('setPassword: [' + id + ']'); + + var tmp = ''; + for (i=0; i < str.length; i++) { + if (str.charAt(i) == unescape(opts.replacement)) { + tmp = tmp + $('#' + id).val().charAt(i); + } + else { + tmp = tmp + str.charAt(i); + } + } + $('#' + id).val(tmp); + } + + check = function(id, oldValue, initialCall) { + if (opts.debug) console.log('check: [' + id + ']'); + + var bullets = $('#' + opts.prefix + id).val(); + + if (oldValue != bullets) { + setPassword(id, bullets); + if (bullets.length > 1) { + var tmp = ''; + for (i=0; i < bullets.length-1; i++) { + tmp = tmp + unescape(opts.replacement); + } + tmp = tmp + bullets.charAt(bullets.length-1); + + $('#' + opts.prefix + id).val(tmp); + } + else { + } + clearTimeout(timer[id]); + timer[id] = setTimeout("convertLastChar('" + id + "')", opts.duration); + } + if (opts.debug) { + $('#debug_' + opts.prefix + id).text($('#' + id).val()); + } + if (!initialCall) { + checker[id] = setTimeout("check('" + id + "', '" + $('#' + opts.prefix + id).val() + "', false)", opts.interval); + } + } + + convertLastChar = function(id) { + if ($('#' + opts.prefix + id).val() != '') { + var tmp = ''; + for (i=0; i < $('#' + opts.prefix + id).val().length; i++) { + tmp = tmp + unescape(opts.replacement); + } + + $('#' + opts.prefix + id).val(tmp); + } + } + }; +}) (jQuery); + -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : More Login-Styling
by Robert Lihm 16 Jul '09

16 Jul '09

ref: refs/heads/master commit 448e9404759cf175bec3adef1ed1cbf26f4d25b6 Author: Robert Lihm <rlihm(a)lihmedia.org> Date: Thu Jul 16 18:19:37 2009 +0200 More Login-Styling * Added feature to password imut-field (maybe security issue?) * Reote more CSS --- webclient/app/views/layouts/main.rhtml | 3 ++- webclient/app/views/sessions/new.rhtml | 1 - webclient/public/javascripts/script.js | 6 ++++++ webclient/public/stylesheets/style.css | 7 ++----- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/webclient/app/views/layouts/main.rhtml b/webclient/app/views/layouts/main.rhtml index af62947..6c12d60 100644 --- a/webclient/app/views/layouts/main.rhtml +++ b/webclient/app/views/layouts/main.rhtml @@ -15,7 +15,8 @@ <script type="text/javascript" charset="utf-8" src="/javascripts/jquery.jqplot.js"></script> <script type="text/javascript" charset="utf-8" src="/javascripts/plugin/jqplot.pieRenderer.js"></script> <script type="text/javascript" charset="utf-8" src="/inc/jquery.ui.custom.js"></script> - + + <script type="text/javascript" charset="utf-8" src="/javascripts/jQuery.dPassword.js"></script> <script type="text/javascript" charset="utf-8" src="/javascripts/script.js"></script> <!--<script type="text/javascript" language="javascript" charset="utf-8" src="/inc/jquery.jqModal.js"></script> diff --git a/webclient/app/views/sessions/new.rhtml b/webclient/app/views/sessions/new.rhtml index d049122..906a5a6 100644 --- a/webclient/app/views/sessions/new.rhtml +++ b/webclient/app/views/sessions/new.rhtml @@ -1,5 +1,4 @@ <div id="login-dialogue"> - <% form_tag( :action => 'create' ) do %> <h2 id="content_title">Login</h2> diff --git a/webclient/public/javascripts/script.js b/webclient/public/javascripts/script.js index d9517f4..af66676 100644 --- a/webclient/public/javascripts/script.js +++ b/webclient/public/javascripts/script.js @@ -7,4 +7,10 @@ $(document).ready(function() { $(this).removeClass('grey-bg'); // remove class for highlighting }); + // Make more usable password-input-field + // http://blog.decaf.de/2009/07/iphone-like-password-fields-using-jquery/ + $('input:password').dPassword({ + duration: 400 // How long will last typed in letter be displayed + }); + }); diff --git a/webclient/public/stylesheets/style.css b/webclient/public/stylesheets/style.css index 560d6a5..fb7f543 100644 --- a/webclient/public/stylesheets/style.css +++ b/webclient/public/stylesheets/style.css @@ -137,10 +137,10 @@ input:focus { #login-dialogue { width: 23em; min-height: 17em; /* FIXME not working in IE6 */ - background: #666; + background: #999; margin: 0 auto; overflow: hidden; - + color: #666; -moz-border-radius: 5px; -webkit-border-radius: 5px; @@ -148,9 +148,7 @@ input:focus { #login-dialogue form { display: block; background: #fefefe; - padding: 5px; - margin: 7px; } #login-dialogue h2 { @@ -159,7 +157,6 @@ input:focus { #login-dialogue label { display: block; width: 5.5em; - color: #666; } /* == Lists and Tables ==================================================== */ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : Made some basic styling for login-form
by Robert Lihm 16 Jul '09

16 Jul '09

ref: refs/heads/master commit 5fd4cee16197092db85344d322bc3e99751f59e2 Author: Robert Lihm <rlihm(a)lihmedia.org> Date: Thu Jul 16 17:56:26 2009 +0200 Made some basic styling for login-form --- webclient/app/views/hosts/index.html.erb | 6 ++-- webclient/app/views/sessions/new.rhtml | 10 ++++--- webclient/public/stylesheets/style.css | 40 +++++++++++++++++++++++++++++- 3 files changed, 48 insertions(+), 8 deletions(-) diff --git a/webclient/app/views/hosts/index.html.erb b/webclient/app/views/hosts/index.html.erb index 495dd3d..f3dd1bf 100644 --- a/webclient/app/views/hosts/index.html.erb +++ b/webclient/app/views/hosts/index.html.erb @@ -8,13 +8,13 @@ <li> <ul> <li> - <%= link_to host.name, new_session_path(:hostid => "#{host.id}") %> + <strong><%= link_to host.name, new_session_path(:hostid => "#{host.id}") %></strong> </li> <li> - <%=h host.url %> + <span><%=h host.url %></span> </li> <li> - <%=h host.description %> + <span><%=h host.description %></span> </li> <li> <%= link_to image_tag("/images/edit-icon.gif", :alt => "edit"), diff --git a/webclient/app/views/sessions/new.rhtml b/webclient/app/views/sessions/new.rhtml index ca736dc..d049122 100644 --- a/webclient/app/views/sessions/new.rhtml +++ b/webclient/app/views/sessions/new.rhtml @@ -1,19 +1,21 @@ -<div class="content"> +<div id="login-dialogue"> + <% form_tag( :action => 'create' ) do %> - <span id="content_title">Login</span> + <h2 id="content_title">Login</h2> <p><%= _("Enter login credentials for host #{(a)host.name}.") %></p> <%= hidden_field_tag 'hostid', @host.id %> - <p><label for="login"><%= _("Username:") %></label><br> + <p><label for="login"><%= _("Username:") %></label> <%= text_field_tag 'login', @user %></p> - <p><label for="password"><%= _("Password:") %></label><br> + <p><label for="password"><%= _("Password:") %></label> <%= password_field_tag 'password', @password %></p> <%= submit_tag(_('Login'), :class => "button", :id => "login_button") %> <% end %> + </div> diff --git a/webclient/public/stylesheets/style.css b/webclient/public/stylesheets/style.css index c9f3cbf..560d6a5 100644 --- a/webclient/public/stylesheets/style.css +++ b/webclient/public/stylesheets/style.css @@ -51,6 +51,14 @@ a:hover { img { border: none; } +input { + border: 1px solid #999; + padding: 3px; +} +input:focus { + border: 1px solid #69c; + color: #69c; +} /* == Basic Structure ===================================================== */ @@ -126,6 +134,33 @@ img { color: #06c; } +#login-dialogue { + width: 23em; + min-height: 17em; /* FIXME not working in IE6 */ + background: #666; + margin: 0 auto; + overflow: hidden; + + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + +} + #login-dialogue form { + display: block; + background: #fefefe; + + padding: 5px; + + margin: 7px; + } + #login-dialogue h2 { + margin: 0; + } + #login-dialogue label { + display: block; + width: 5.5em; + color: #666; + } /* == Lists and Tables ==================================================== */ .list-row { @@ -194,6 +229,10 @@ ul.list-2level-inline ul { .list-2level-inline + p { clear: left; } + .list-2level-inline ul li span { + color: #666; + } + /* == Helper Styles ======================================================= */ .grey-bg { @@ -203,7 +242,6 @@ ul.list-2level-inline ul { a.button { color: #444; border: 1px solid #06c; - background: #0072ba url('images/bg-head-gradient-grey.png') repeat-x scroll top center; padding: 0.5em; -moz-border-radius: 5px; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : Added basic styles for service list
by Robert Lihm 16 Jul '09

16 Jul '09

ref: refs/heads/master commit cc2b0d458ffeae0fd7ea95001cbc25baa0c61fc2 Author: Robert Lihm <rlihm(a)lihmedia.org> Date: Thu Jul 16 17:32:12 2009 +0200 Added basic styles for service list --- webclient/app/views/hosts/index.html.erb | 20 +++++++++----------- webclient/public/stylesheets/style.css | 20 ++++++++++++++++++++ 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/webclient/app/views/hosts/index.html.erb b/webclient/app/views/hosts/index.html.erb index 9031be7..495dd3d 100644 --- a/webclient/app/views/hosts/index.html.erb +++ b/webclient/app/views/hosts/index.html.erb @@ -3,9 +3,8 @@ <div class="services-list"> <label for="services-list">Please choose a service:</label> - <ul> + <ul class="list-2level-inline"> <% for host in @hosts %> - <li> <ul> <li> @@ -27,16 +26,15 @@ </li> </ul> </li> - <% end %> - </ul> - - <%= link_to _('Add'), new_host_path, :class => "button" %> -  + <p> + <%= link_to _('Add'), new_host_path, :class => "button" %> + </p> +  </div>  \ No newline at end of file diff --git a/webclient/public/stylesheets/style.css b/webclient/public/stylesheets/style.css index 75af6f2..c9f3cbf 100644 --- a/webclient/public/stylesheets/style.css +++ b/webclient/public/stylesheets/style.css @@ -174,6 +174,26 @@ img { -moz-border-radius: 5px; -webkit-border-radius: 5px; } + + +ul.list-2level-inline, +ul.list-2level-inline ul { + list-style: none outside; + margin: 0; + padding: 0; + overflow: hidden; +} + .list-2level-inline ul { + + } + .list-2level-inline ul li { + float: left; + margin-right: 1em; + } + + .list-2level-inline + p { + clear: left; + } /* == Helper Styles ======================================================= */ .grey-bg { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r58098 - /tags/branch-SLE-10-SP3-2_13_162/bootloader/
by juhliarik＠svn.opensuse.org 16 Jul '09

16 Jul '09

Author: juhliarik Date: Thu Jul 16 17:27:55 2009 New Revision: 58098 URL: http://svn.opensuse.org/viewcvs/yast?rev=58098&view=rev Log: Created tag branch-SLE-10-SP3-2_13_162 for bootloader Added: tags/branch-SLE-10-SP3-2_13_162/bootloader/ - copied from r58097, branches/SuSE-SLE-10-SP3-Branch/bootloader/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r58097 - /tags/branch-SLE-10-SP3-2_13_162/
by juhliarik＠svn.opensuse.org 16 Jul '09

16 Jul '09

Author: juhliarik Date: Thu Jul 16 17:27:53 2009 New Revision: 58097 URL: http://svn.opensuse.org/viewcvs/yast?rev=58097&view=rev Log: Created tag branch-SLE-10-SP3-2_13_162 Added: tags/branch-SLE-10-SP3-2_13_162/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r58096 - in /branches/SuSE-SLE-10-SP3-Branch/bootloader: ./ package/ scripts/ src/grub/ src/modules/
by juhliarik＠svn.opensuse.org 16 Jul '09

16 Jul '09

Author: juhliarik Date: Thu Jul 16 17:27:43 2009 New Revision: 58096 URL: http://svn.opensuse.org/viewcvs/yast?rev=58096&view=rev Log: added several fixes Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-SLE-10-SP3-Branch/bootloader/scripts/examine_mbr.pl branches/SuSE-SLE-10-SP3-Branch/bootloader/src/grub/misc.ycp branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootCommon.ycp branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootLILO.ycp branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/Bootloader.ycp branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/GfxMenu.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION Thu Jul 16 17:27:43 2009 @@ -1 +1 @@ -2.13.161 +2.13.162 Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes Thu Jul 16 17:27:43 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Jul 16 12:52:56 CEST 2009 - juhliarik(a)suse.cz + +- update checking of MBR and bootloader proposal (bnc#517293) +- added fix for calling /sbin/lilo (bnc#466427) +- added fix for update if xen is installed (bnc#278739) +- 2.13.162 + +------------------------------------------------------------------- Mon Jun 29 16:45:48 CEST 2009 - juhliarik(a)suse.cz - update support of UEFI on x86-64 (fate#306032) Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/scripts/examine_mbr.pl URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/scripts/examine_mbr.pl (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/scripts/examine_mbr.pl Thu Jul 16 17:27:43 2009 @@ -23,7 +23,7 @@ if (substr($MBR, 320, 126) =~ m,invalid partition table.*no operating system,i) { print "Generic MBR\n"; - exit 0; + exit 1; } if (substr($MBR, 346, 100) =~ m,GRUB .Geom.Hard Disk.Read. Error,) { @@ -36,5 +36,17 @@ exit 1; } +if (substr($MBR, 12, 500) =~ m,NTLDR is missing,) { + print "Windows bootloader stage1\n"; + exit 0; +} + +if (substr($MBR, 0, 440) =~ + m,invalid partition table.*Error loading operating system,i) { + print "Vista MBR\n"; + exit 0; +} + + print "unknown\n"; exit 1; Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/src/grub/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/src/grub/misc.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/src/grub/misc.ycp Thu Jul 16 17:27:43 2009 @@ -548,7 +548,7 @@ // NOTE: selected_location is a temporary local variable now; the global // variable is not used for grub anymore symbol selected_location = `mbr; // default to mbr - + boolean windows_mbr = false; // check whether the /boot partition // - is primary: is_logical -> false // - is on the first disk (with the MBR): boot_partition_is_on_mbr_disk -> true @@ -635,6 +635,11 @@ y2milestone ("MBR examining script returned %1", out); integer exit = out["exit"]:0; BootCommon::globals["generic_mbr"] = ((exit != 0) && (! keep_mbr)) ? "true" : "false"; + if (exit == 0) + { + y2milestone("It should be Windows MBR..."); + windows_mbr = true; + } } else if (size (underlying_boot_partition_devices) > 1) { @@ -686,7 +691,8 @@ // boot Linux) // kokso: fix the problem with proposing installation generic boot code to "/" or "/boot" // kokso: if boot device is on logical partition - if (is_logical && (extended != nil) && (BootCommon::globals["generic_mbr"]:"" == "true")) + if (is_logical && (extended != nil) && (BootCommon::globals["generic_mbr"]:"" == "true" || + windows_mbr)) selected_location = `extended; BootCommon::globals["activate"] = "true"; SetBootloaderDevice(selected_location); Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootCommon.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootCommon.ycp Thu Jul 16 17:27:43 2009 @@ -425,7 +425,7 @@ global boolean UsingXenPae() { if (Mode::test()) return true; - if (Mode::normal()) + if (Mode::normal() || Mode::update()) return Pkg::IsProvided ("kernel-xenpae"); return Pkg::IsSelected ("kernel-xenpae"); } Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootLILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootLILO.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootLILO.ycp Thu Jul 16 17:27:43 2009 @@ -271,7 +271,8 @@ BootCommon::BootPartitionDevice)) { y2milestone ("Creating backup copy to bootsector"); - SCR::Execute (.target.bash, sformat ("/sbin/lilo -b %1", + // add fix for calling lilo (bnc#466427) + SCR::Execute (.target.bash, sformat ("/sbin/lilo -P ignore -b %1", BootCommon::BootPartitionDevice)); } } @@ -297,8 +298,9 @@ */ global define boolean FlagOnetimeBoot (string section) { + // add fix for calling lilo (bnc#466427) map result = (map)SCR::Execute (.target.bash_output, - sformat ("/sbin/lilo -R \"%1\"", section)); + sformat ("/sbin/lilo -P ignore -R \"%1\"", section)); y2milestone ("lilo returned %1", result); return (result["exit"]:-1 == 0); } Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/Bootloader.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/Bootloader.ycp Thu Jul 16 17:27:43 2009 @@ -1082,7 +1082,8 @@ /* * This is extreme boolshit, Bootloader::Library has to be called */ - string bl_command = "/sbin/lilo >> /var/log/YaST2/y2log_bootloader 2>&1"; + // add fix for calling lilo (bnc#466427) + string bl_command = "/sbin/lilo -P ignore >> /var/log/YaST2/y2log_bootloader 2>&1"; boolean command_ret = 0 == SCR::Execute (.target.bash, bl_command); if (! command_ret) { Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/GfxMenu.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/GfxMenu.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/GfxMenu.ycp Thu Jul 16 17:27:43 2009 @@ -427,7 +427,8 @@ if (loader == "lilo") { - map out = (map)SCR::Execute (.target.bash_output, "/sbin/lilo"); + // add fix for calling lilo (bnc#466427) + map out = (map)SCR::Execute (.target.bash_output, "/sbin/lilo -P ignore"); if (out["exit"]:0 != 0) { y2error ("Output of /sbin/lilo: %1", out); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0