diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
| commit | 1be510f9529cb082f802408b472a77d074b394c0 (patch) | |
| tree | b175f9d5fcb107576dabc768e7bd04d4a3e491a0 /zarb-ml/mageia-dev/attachments/20121112 | |
| parent | fa5098cf210b23ab4f419913e28af7b1b07dafb2 (diff) | |
| download | archives-master.tar archives-master.tar.gz archives-master.tar.bz2 archives-master.tar.xz archives-master.zip | |
Diffstat (limited to 'zarb-ml/mageia-dev/attachments/20121112')
4 files changed, 134 insertions, 0 deletions
diff --git a/zarb-ml/mageia-dev/attachments/20121112/557570ea/attachment-0001.bin b/zarb-ml/mageia-dev/attachments/20121112/557570ea/attachment-0001.bin new file mode 100644 index 000000000..a10a9ae25 --- /dev/null +++ b/zarb-ml/mageia-dev/attachments/20121112/557570ea/attachment-0001.bin @@ -0,0 +1,54 @@ +Index: diskdrake/interactive.pm +=================================================================== +--- diskdrake/interactive.pm (revision 6434) ++++ diskdrake/interactive.pm (working copy) +@@ -323,7 +323,10 @@ + + sub hd_possible_actions_extra { + my ($_hd) = @_; +- $::expert ? N_("Toggle to normal mode") : N_("Toggle to expert mode"); ++ ( ++ N_("Refresh"), ++ $::expert ? N_("Toggle to normal mode") : N_("Toggle to expert mode"), ++ ); + } + + +@@ -338,6 +341,29 @@ + &hd_possible_actions, N_("Hard disk drive information"); + } + ++sub Refresh { ++ my ($in, $current_hd, $all_hds) = @_; ++ ++ # redo the first2 steps in a diff variable ++ my $all_hds2 = fsedit::get_hds({}, $in); ++ # TODO: do i need to get_raw_hds too? are raw disks shown? ++ # fs::get_raw_hds('', $all_hds2); ++ ++ # file based index of old hds ++ my %old_hds = map { $_->{file} => $_ } @{$all_hds->{hds}}; ++ ++ # same for new, but also push the new hd to all_hds if it has different size or not exist ++ my %new_hds = map { push @{$all_hds->{hds}} if (!defined $old_hds{$_->{file}} || $_->{total_sectors} != $old_hds{$_->{file}}->{total_sectors}); $_->{file} => $_ } @{$all_hds2->{hds}}; ++ ++ # find deleted ones ++ for my $hd (@{$all_hds->{hds}}) { ++ if (!defined $new_hds{$hd->{file}}) { ++ # TODO: mark the hd as unavailable ++ } ++ } ++ $all_hds; ++} ++ + sub Clear_all { + my ($in, $hd, $all_hds) = @_; + return if detect_devices::is_xbox(); #- do not let them wipe the OS +@@ -1134,6 +1160,7 @@ + *{'Toggle to normal mode'} = sub() { $::expert = 0 }; + *{'Toggle to expert mode'} = sub() { $::expert = 1 }; + *{'Clear all'} = \&Clear_all; ++ *{'Refresh'} = \&Refresh; + *{'Auto allocate'} = \&Auto_allocate; + *{'Mount point'} = \&Mount_point; + *{'Modify RAID'} = \&ModifyRAID; diff --git a/zarb-ml/mageia-dev/attachments/20121112/557570ea/attachment.bin b/zarb-ml/mageia-dev/attachments/20121112/557570ea/attachment.bin new file mode 100644 index 000000000..a10a9ae25 --- /dev/null +++ b/zarb-ml/mageia-dev/attachments/20121112/557570ea/attachment.bin @@ -0,0 +1,54 @@ +Index: diskdrake/interactive.pm +=================================================================== +--- diskdrake/interactive.pm (revision 6434) ++++ diskdrake/interactive.pm (working copy) +@@ -323,7 +323,10 @@ + + sub hd_possible_actions_extra { + my ($_hd) = @_; +- $::expert ? N_("Toggle to normal mode") : N_("Toggle to expert mode"); ++ ( ++ N_("Refresh"), ++ $::expert ? N_("Toggle to normal mode") : N_("Toggle to expert mode"), ++ ); + } + + +@@ -338,6 +341,29 @@ + &hd_possible_actions, N_("Hard disk drive information"); + } + ++sub Refresh { ++ my ($in, $current_hd, $all_hds) = @_; ++ ++ # redo the first2 steps in a diff variable ++ my $all_hds2 = fsedit::get_hds({}, $in); ++ # TODO: do i need to get_raw_hds too? are raw disks shown? ++ # fs::get_raw_hds('', $all_hds2); ++ ++ # file based index of old hds ++ my %old_hds = map { $_->{file} => $_ } @{$all_hds->{hds}}; ++ ++ # same for new, but also push the new hd to all_hds if it has different size or not exist ++ my %new_hds = map { push @{$all_hds->{hds}} if (!defined $old_hds{$_->{file}} || $_->{total_sectors} != $old_hds{$_->{file}}->{total_sectors}); $_->{file} => $_ } @{$all_hds2->{hds}}; ++ ++ # find deleted ones ++ for my $hd (@{$all_hds->{hds}}) { ++ if (!defined $new_hds{$hd->{file}}) { ++ # TODO: mark the hd as unavailable ++ } ++ } ++ $all_hds; ++} ++ + sub Clear_all { + my ($in, $hd, $all_hds) = @_; + return if detect_devices::is_xbox(); #- do not let them wipe the OS +@@ -1134,6 +1160,7 @@ + *{'Toggle to normal mode'} = sub() { $::expert = 0 }; + *{'Toggle to expert mode'} = sub() { $::expert = 1 }; + *{'Clear all'} = \&Clear_all; ++ *{'Refresh'} = \&Refresh; + *{'Auto allocate'} = \&Auto_allocate; + *{'Mount point'} = \&Mount_point; + *{'Modify RAID'} = \&ModifyRAID; diff --git a/zarb-ml/mageia-dev/attachments/20121112/d7c8bb06/attachment-0001.html b/zarb-ml/mageia-dev/attachments/20121112/d7c8bb06/attachment-0001.html new file mode 100644 index 000000000..46480f2f3 --- /dev/null +++ b/zarb-ml/mageia-dev/attachments/20121112/d7c8bb06/attachment-0001.html @@ -0,0 +1,13 @@ +<div>So it means some bugs or even security problems are not fixed in cauldron but in stable releases? I thought they should be fixed at the same time.<br></div><div><br></div><div>BTW, is there any reason why we won't upgrade to mariadb 5.5.28 at the moment?</div> + +<div class="gmail_extra"><br><br><div class="gmail_quote">2012/11/11 Thomas Spuhler <span dir="ltr"><<a href="mailto:thomas@btspuhler.com" target="_blank">thomas@btspuhler.com</a>></span><br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> +I just upgrade to alpha3 from mga2. It went very smoothly.<br> +But a cannot upgrade mariadb to cauldron because its older then the installed package. rel.2 vs. rel<br> +2<br> +mariadb needs to have the rel bumped<br> +I am not brave enough to do that.<br> +<span class="HOEnZb"><font color="#888888"><br> +--<br> +Best regards<br> +Thomas Spuhler<br> +</font></span></blockquote></div><br></div> diff --git a/zarb-ml/mageia-dev/attachments/20121112/d7c8bb06/attachment.html b/zarb-ml/mageia-dev/attachments/20121112/d7c8bb06/attachment.html new file mode 100644 index 000000000..46480f2f3 --- /dev/null +++ b/zarb-ml/mageia-dev/attachments/20121112/d7c8bb06/attachment.html @@ -0,0 +1,13 @@ +<div>So it means some bugs or even security problems are not fixed in cauldron but in stable releases? I thought they should be fixed at the same time.<br></div><div><br></div><div>BTW, is there any reason why we won't upgrade to mariadb 5.5.28 at the moment?</div> + +<div class="gmail_extra"><br><br><div class="gmail_quote">2012/11/11 Thomas Spuhler <span dir="ltr"><<a href="mailto:thomas@btspuhler.com" target="_blank">thomas@btspuhler.com</a>></span><br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> +I just upgrade to alpha3 from mga2. It went very smoothly.<br> +But a cannot upgrade mariadb to cauldron because its older then the installed package. rel.2 vs. rel<br> +2<br> +mariadb needs to have the rel bumped<br> +I am not brave enough to do that.<br> +<span class="HOEnZb"><font color="#888888"><br> +--<br> +Best regards<br> +Thomas Spuhler<br> +</font></span></blockquote></div><br></div> |