#!/usr/bin/perl # DiskDrake # Copyright (C) 1999 MandrakeSoft (pixel@linux-mandrake.com) # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2, or (at your option) # any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # DiskDrake uses resize_fat which is a perl rewrite of the work of Andrew # Clausen (libresize). # DiskDrake is also based upon the libfdisk and the install from Red Hat Software use lib qw(/usr/lib/libDrakX); use common qw(:common :functional); use diskdrake; use interactive_gtk; use detect_devices; use fsedit; use fs; use log; use c; local $_ = join '', @ARGV; /-h/ and die "usage: diskdrake [--expert] [--testing]\n"; $::expert = /-expert/; $::testing = /-testing/; $::isStandalone = 1; if ($>) { $ENV{PATH} = "/sbin:/usr/sbin:$ENV{PATH}"; } #if ($ARGV[0] eq '-l') { # $@ and print "Error\n"; # $::expert = 1; # print diskdrake::get_info($_, $hds->[0]) foreach fsedit::get_fstab($hds->[0]); # exit !$@; #} my $in = interactive_gtk->new; my $hds = catch_cdie { fsedit::hds([ detect_devices::hds() ], {}) } sub { my ($err) = $@ =~ /(.*) at /; $@ =~ /overlapping/ and $in->ask_warn('', $@), return 1; $in->ask_okcancel(_("Error"), [_("I can't read your partition table, it's too corrupted for me :( I'll try to go on blanking bad partitions"), $err]); }; $SIG{__DIE__} = sub { chomp (my $m = $_[0]); log::l("ERROR: $m") }; my $fstab = [ fsedit::get_fstab(@$hds) ]; fs::get_mntpoints_from_fstab($fstab); fs::check_mounted($fstab); diskdrake::main($hds, {}, $in); $in->exit(0); n> <option value='topic/MDK-2006_0-update'>topic/MDK-2006_0-update</option> <option value='topic/MDK92-branch'>topic/MDK92-branch</option> <option value='topic/MDKC_1_0'>topic/MDKC_1_0</option> <option value='topic/PCMCIA_CS_DISTRO'>topic/PCMCIA_CS_DISTRO</option> <option value='topic/R9_0-64bit-branch'>topic/R9_0-64bit-branch</option> <option value='topic/R9_1_HP-branch'>topic/R9_1_HP-branch</option> <option value='topic/a'>topic/a</option> <option value='topic/before_matchbox_wm'>topic/before_matchbox_wm</option> <option value='topic/dietlibc'>topic/dietlibc</option> <option value='topic/firewall'>topic/firewall</option> <option value='topic/gdk-pixbuf-0-branch'>topic/gdk-pixbuf-0-branch</option> <option value='topic/gi-ppc'>topic/gi-ppc</option> <option value='topic/ia64-8_1'>topic/ia64-8_1</option> <option value='topic/mandrakesoft'>topic/mandrakesoft</option> <option value='topic/mlcd4'>topic/mlcd4</option> <option value='topic/ppp'>topic/ppp</option> <option value='topic/rp-pppoe'>topic/rp-pppoe</option> <option value='topic/switching_to_urpmi'>topic/switching_to_urpmi</option> <option value='topic/unlabeled-1.1.1'>topic/unlabeled-1.1.1</option> <option value='topic/v_webmin_0_87'>topic/v_webmin_0_87</option> <option value='topic/x86_64-branch'>topic/x86_64-branch</option> </select> <input type='submit' value='switch'/></form></td></tr> <tr><td class='sub'>Mageia Installer and base platform for many utilities</td><td class='sub right'>Thierry Vignaud [tv]</td></tr></table> <table class='tabs'><tr><td> <a href='/software/drakx-backup-do-not-use/?h=topic/MDK-10-update'>summary</a><a href='/software/drakx-backup-do-not-use/refs/?h=topic/MDK-10-update&id=21f753634113afa55eda54a495017c5eef8fc462'>refs</a><a href='/software/drakx-backup-do-not-use/log/?h=topic/MDK-10-update'>log</a><a href='/software/drakx-backup-do-not-use/tree/?h=topic/MDK-10-update&id=21f753634113afa55eda54a495017c5eef8fc462'>tree</a><a class='active' href='/software/drakx-backup-do-not-use/commit/?h=topic/MDK-10-update&id=21f753634113afa55eda54a495017c5eef8fc462'>commit</a><a href='/software/drakx-backup-do-not-use/diff/?h=topic/MDK-10-update&id=21f753634113afa55eda54a495017c5eef8fc462'>diff</a><a href='/software/drakx-backup-do-not-use/stats/?h=topic/MDK-10-update'>stats</a></td><td class='form'><form class='right' method='get' action='/software/drakx-backup-do-not-use/log/'> <input type='hidden' name='h' value='topic/MDK-10-update'/><input type='hidden' name='id' value='21f753634113afa55eda54a495017c5eef8fc462'/><select name='qt'> <option value='grep'>log msg</option> <option value='author'>author</option> <option value='committer'>committer</option> <option value='range'>range</option> </select> <input class='txt' type='search' size='10' name='q' value=''/> <input type='submit' value='search'/> </form> </td></tr></table> <div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='h' value='topic/MDK-10-update'/><input type='hidden' name='id' value='21f753634113afa55eda54a495017c5eef8fc462'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'> <tr><th>author</th><td>Pascal Rigaux <pixel@mandriva.com></td><td class='right'>2000-07-20 00:28:02 +0000</td></tr> <tr><th>committer</th><td>Pascal Rigaux <pixel@mandriva.com></td><td class='right'>2000-07-20 00:28:02 +0000</td></tr> <tr><th>commit</th><td colspan='2' class='sha1'><a href='/software/drakx-backup-do-not-use/commit/?h=topic/MDK-10-update&id=21f753634113afa55eda54a495017c5eef8fc462'>21f753634113afa55eda54a495017c5eef8fc462</a> (<a href='/software/drakx-backup-do-not-use/patch/?id=21f753634113afa55eda54a495017c5eef8fc462'>patch</a>)</td></tr> <tr><th>tree</th><td colspan='2' class='sha1'><a href='/software/drakx-backup-do-not-use/tree/?h=topic/MDK-10-update&id=21f753634113afa55eda54a495017c5eef8fc462'>e017dc86e92d288b17aa7a94479af392da8940f1</a></td></tr> <tr><th>parent</th><td colspan='2' class='sha1'><a href='/software/drakx-backup-do-not-use/commit/?h=topic/MDK-10-update&id=60225ecd25a9879c5484e4d65f2e1c05388010b3'>60225ecd25a9879c5484e4d65f2e1c05388010b3</a> (<a href='/software/drakx-backup-do-not-use/diff/?h=topic/MDK-10-update&id=21f753634113afa55eda54a495017c5eef8fc462&id2=60225ecd25a9879c5484e4d65f2e1c05388010b3'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='sha1'><a href='/software/drakx-backup-do-not-use/snapshot/drakx-backup-do-not-use-21f753634113afa55eda54a495017c5eef8fc462.tar'>drakx-backup-do-not-use-21f753634113afa55eda54a495017c5eef8fc462.tar</a><br/><a href='/software/drakx-backup-do-not-use/snapshot/drakx-backup-do-not-use-21f753634113afa55eda54a495017c5eef8fc462.tar.gz'>drakx-backup-do-not-use-21f753634113afa55eda54a495017c5eef8fc462.tar.gz</a><br/><a href='/software/drakx-backup-do-not-use/snapshot/drakx-backup-do-not-use-21f753634113afa55eda54a495017c5eef8fc462.tar.bz2'>drakx-backup-do-not-use-21f753634113afa55eda54a495017c5eef8fc462.tar.bz2</a><br/><a href='/software/drakx-backup-do-not-use/snapshot/drakx-backup-do-not-use-21f753634113afa55eda54a495017c5eef8fc462.tar.xz'>drakx-backup-do-not-use-21f753634113afa55eda54a495017c5eef8fc462.tar.xz</a><br/><a href='/software/drakx-backup-do-not-use/snapshot/drakx-backup-do-not-use-21f753634113afa55eda54a495017c5eef8fc462.zip'>drakx-backup-do-not-use-21f753634113afa55eda54a495017c5eef8fc462.zip</a><br/></td></tr></table> <div class='commit-subject'>no_comment</div><div class='commit-msg'></div><div class='diffstat-header'><a href='/software/drakx-backup-do-not-use/diff/?h=topic/MDK-10-update&id=21f753634113afa55eda54a495017c5eef8fc462'>Diffstat</a></div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx-backup-do-not-use/diff/perl-install/Xconfigurator.pm?h=topic/MDK-10-update&id=21f753634113afa55eda54a495017c5eef8fc462'>perl-install/Xconfigurator.pm</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='49%'><tr><td class='add' style='width: 36.7%;'/><td class='rem' style='width: 63.3%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx-backup-do-not-use/diff/perl-install/common.pm?h=topic/MDK-10-update&id=21f753634113afa55eda54a495017c5eef8fc462'>perl-install/common.pm</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='49%'><tr><td class='add' style='width: 22.4%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 75.5%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx-backup-do-not-use/diff/perl-install/install2.pm?h=topic/MDK-10-update&id=21f753634113afa55eda54a495017c5eef8fc462'>perl-install/install2.pm</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='49%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 6.1%;'/><td class='none' style='width: 87.8%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx-backup-do-not-use/diff/perl-install/install_steps_gtk.pm?h=topic/MDK-10-update&id=21f753634113afa55eda54a495017c5eef8fc462'>perl-install/install_steps_gtk.pm</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='49%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx-backup-do-not-use/diff/perl-install/install_steps_interactive.pm?h=topic/MDK-10-update&id=21f753634113afa55eda54a495017c5eef8fc462'>perl-install/install_steps_interactive.pm</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='49%'><tr><td class='add' style='width: 10.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.8%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx-backup-do-not-use/diff/perl-install/modules.pm?h=topic/MDK-10-update&id=21f753634113afa55eda54a495017c5eef8fc462'>perl-install/modules.pm</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='49%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr> </table><div class='diffstat-summary'>6 files changed, 39 insertions, 37 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm<br/>index da65dda90..f2cb51bcf 100644<br/>--- a/<a href='/software/drakx-backup-do-not-use/tree/perl-install/Xconfigurator.pm?h=topic/MDK-10-update&id=60225ecd25a9879c5484e4d65f2e1c05388010b3'>perl-install/Xconfigurator.pm</a><br/>+++ b/<a href='/software/drakx-backup-do-not-use/tree/perl-install/Xconfigurator.pm?h=topic/MDK-10-update&id=21f753634113afa55eda54a495017c5eef8fc462'>perl-install/Xconfigurator.pm</a></div><div class='hunk'>@@ -1020,35 +1020,22 @@ _("I can set up your computer to automatically start X upon booting.</div><div class='ctx'> Would you like X to start when you reboot?"), 1);</div><div class='ctx'> rewriteInittab($run ? 5 : 3) unless $::testing;</div><div class='ctx'> </div><div class='del'>- if ($o->{miscellaneous}{autologin} || $::auto || $in->ask_yesorno(_("Autologin at startup"),</div><div class='del'>- _("I can set up your computer to automatically log on one user.</div><div class='del'>-Would you like to use this feature?"), 1))</div><div class='del'>- {</div><div class='del'>- $o->{miscellaneous}{autologin}=1;</div><div class='del'>- my @users;</div><div class='del'>- my @etc_pass_fields = qw(name pw uid gid realname home shell);</div><div class='del'>- my @lines = cat_(my $f = "$o->{prefix}/etc/passwd") or log::l("missing passwd file"), return;</div><div class='del'>- foreach (@lines) {</div><div class='del'>- my %l; @l{@etc_pass_fields} = split ':';</div><div class='del'>- if ($l{"uid"} > 500) {</div><div class='del'>- push @users, $l{"name"};</div><div class='del'>- }</div><div class='del'>- }</div><div class='del'>- if ( $in->ask_from_entries_refH(</div><div class='del'>- [ _("Autologin"), _("Ok"), _("Cancel") ],</div><div class='del'>- _("Autologin - Choose default user\n"),</div><div class='del'>- [ _("Choose the default user :") => {val => \$o->{miscellaneous}{autologuser}, list => \@users, not_edit => 1} ],</div><div class='del'>- complete => sub {</div><div class='del'>- $o->{miscellaneous}{autologuser} or $in->ask_warn('', _("Please choose a user in the list")), return (1,0);</div><div class='del'>- return 0;</div><div class='del'>- }</div><div class='del'>- ))</div><div class='del'>- {</div><div class='del'>- $o->{miscellaneous}{autologin}=1;</div><div class='del'>- }</div><div class='del'>- else { $o->{miscellaneous}{autologin}=0; }</div><div class='del'>- }</div><div class='del'>- }</div><div class='add'>+ my @etc_pass_fields = qw(name pw uid gid realname home shell);</div><div class='add'>+ my @users = mapgrep {</div><div class='add'>+ my %l; @l{@etc_pass_fields} = split ':';</div><div class='add'>+ $l{uid} > 500, $l{name};</div><div class='add'>+ } cat_("$o->{prefix}/etc/passwd");</div><div class='add'>+</div><div class='add'>+ if (exists $o->{miscellaneous}{autologin} || $::auto || @users</div><div class='add'>+ || $in->ask_yesorno(_("Autologin at startup"),</div><div class='add'>+_("I can set up your computer to automatically log on one user.</div><div class='add'>+Would you like to use this feature?"), 1)) {</div><div class='add'>+ $o->{miscellaneous}{autologin} = $in->ask_from_entries_refH(_("Autologin"),</div><div class='add'>+ _("Autologin - Choose default user\n"),</div><div class='add'>+ [ _("Choose the default user :") => {val => \$o->{miscellaneous}{autologuser}, list => \@users, not_edit => 1} ],</div><div class='add'>+ );</div><div class='add'>+ }</div><div class='add'>+ }</div><div class='ctx'> run_program::rooted($prefix, "chkconfig", "--del", "gpm") if $o->{mouse}{device} =~ /ttyS/ && !$::isStandalone;</div><div class='del'>- }</div><div class='del'>- }</div><div class='add'>+ }</div><div class='add'>+}</div><div class='head'>diff --git a/perl-install/common.pm b/perl-install/common.pm<br/>index cbbc79ff2..1ad2f85b1 100644<br/>--- a/<a href='/software/drakx-backup-do-not-use/tree/perl-install/common.pm?h=topic/MDK-10-update&id=60225ecd25a9879c5484e4d65f2e1c05388010b3'>perl-install/common.pm</a><br/>+++ b/<a href='/software/drakx-backup-do-not-use/tree/perl-install/common.pm?h=topic/MDK-10-update&id=21f753634113afa55eda54a495017c5eef8fc462'>perl-install/common.pm</a></div><div class='hunk'>@@ -7,7 +7,7 @@ use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK $printable_chars $sizeof_int $bitof_int</div><div class='ctx'> @ISA = qw(Exporter);</div><div class='ctx'> %EXPORT_TAGS = (</div><div class='ctx'> common => [ qw(__ even odd arch better_arch compat_arch min max sqr sum and_ or_ sign product bool invbool listlength bool2text bool2yesno text2bool to_int to_float ikeys member divide is_empty_array_ref is_empty_hash_ref add2hash add2hash_ set_new set_add round round_up round_down first second top uniq translate untranslate warp_text formatAlaTeX formatLines deref) ],</div><div class='del'>- functional => [ qw(fold_left compose map_index grep_index map_each grep_each list2kv map_tab_hash mapn mapn_ difference2 before_leaving catch_cdie cdie combine) ],</div><div class='add'>+ functional => [ qw(fold_left compose mapgrep map_index grep_index map_each grep_each list2kv map_tab_hash mapn mapn_ difference2 before_leaving catch_cdie cdie combine) ],</div><div class='ctx'> file => [ qw(dirname basename touch all glob_ cat_ output symlinkf chop_ mode typeFromMagic expand_symlinks) ],</div><div class='ctx'> system => [ qw(sync makedev unmakedev psizeof strcpy gettimeofday syscall_ salt getVarsFromSh setVarsInSh setVarsInCsh substInFile availableRam availableMemory removeXiBSuffix template2file formatTime unix2dos setVirtual) ],</div><div class='ctx'> constant => [ qw($printable_chars $sizeof_int $bitof_int $SECTORSIZE %compat_arch) ],</div><div class='hunk'>@@ -156,6 +156,16 @@ sub touch {</div><div class='ctx'> utime $now, $now, $f;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+sub mapgrep(&@) {</div><div class='add'>+ my $f = shift;</div><div class='add'>+ my @l;</div><div class='add'>+ foreach (@_) {</div><div class='add'>+ my ($b, $v) = $f->($_);</div><div class='add'>+ push @l, $v if $b;</div><div class='add'>+ }</div><div class='add'>+ @l;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> sub map_index(&@) {</div><div class='ctx'> my $f = shift;</div><div class='ctx'> my @v; local $::i = 0;</div><div class='head'>diff --git a/perl-install/install2.pm b/perl-install/install2.pm<br/>index 9bbad4da8..633b46eb3 100644<br/>--- a/<a href='/software/drakx-backup-do-not-use/tree/perl-install/install2.pm?h=topic/MDK-10-update&id=60225ecd25a9879c5484e4d65f2e1c05388010b3'>perl-install/install2.pm</a><br/>+++ b/<a href='/software/drakx-backup-do-not-use/tree/perl-install/install2.pm?h=topic/MDK-10-update&id=21f753634113afa55eda54a495017c5eef8fc462'>perl-install/install2.pm</a></div><div class='hunk'>@@ -721,9 +721,6 @@ sub main {</div><div class='ctx'> </div><div class='ctx'> last if $o->{step} eq 'exitInstall';</div><div class='ctx'> }</div><div class='del'>- #- mainly for auto_install's</div><div class='del'>- run_program::rooted($o->{prefix}, "sh", "-c", $o->{postInstall}) if $o->{postInstall};</div><div class='del'>-</div><div class='ctx'> install_any::clean_postinstall_rpms();</div><div class='ctx'> install_any::ejectCdrom();</div><div class='ctx'> </div><div class='hunk'>@@ -742,6 +739,9 @@ sub main {</div><div class='ctx'> </div><div class='ctx'> -e "$o->{prefix}/usr/bin/urpmi" or eval { commands::rm("-rf", "$o->{prefix}/var/lib/urpmi") };</div><div class='ctx'> </div><div class='add'>+ #- mainly for auto_install's</div><div class='add'>+ run_program::rooted($o->{prefix}, "sh", "-c", $o->{postInstall}) if $o->{postInstall};</div><div class='add'>+</div><div class='ctx'> #- have the really bleeding edge ddebug.log</div><div class='ctx'> eval { commands::cp('-f', "/tmp/ddebug.log", "$o->{prefix}/root") };</div><div class='ctx'> </div><div class='head'>diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm<br/>index 74cae0157..8894f72ff 100644<br/>--- a/<a href='/software/drakx-backup-do-not-use/tree/perl-install/install_steps_gtk.pm?h=topic/MDK-10-update&id=60225ecd25a9879c5484e4d65f2e1c05388010b3'>perl-install/install_steps_gtk.pm</a><br/>+++ b/<a href='/software/drakx-backup-do-not-use/tree/perl-install/install_steps_gtk.pm?h=topic/MDK-10-update&id=21f753634113afa55eda54a495017c5eef8fc462'>perl-install/install_steps_gtk.pm</a></div><div class='hunk'>@@ -97,7 +97,7 @@ sub new($$) {</div><div class='ctx'> my $prog = /Xsun/ || /Xpmac/ ? $_ : "XF86_$_";</div><div class='ctx'> unless (-x "$dir/$prog") {</div><div class='ctx'> unlink $_ foreach glob_("$dir/X*");</div><div class='del'>- install_any::getAndSaveFile("$dir/$prog", "$dir/$prog") or die "failed to get server: $!";</div><div class='add'>+ install_any::getAndSaveFile("$dir/$prog", "$dir/$prog") or die "failed to get server $prog: $!";</div><div class='ctx'> chmod 0755, "$dir/$prog";</div><div class='ctx'> }</div><div class='ctx'> if (/FB/) {</div><div class='head'>diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm<br/>index 91abcdc20..38dff712e 100644<br/>--- a/<a href='/software/drakx-backup-do-not-use/tree/perl-install/install_steps_interactive.pm?h=topic/MDK-10-update&id=60225ecd25a9879c5484e4d65f2e1c05388010b3'>perl-install/install_steps_interactive.pm</a><br/>+++ b/<a href='/software/drakx-backup-do-not-use/tree/perl-install/install_steps_interactive.pm?h=topic/MDK-10-update&id=21f753634113afa55eda54a495017c5eef8fc462'>perl-install/install_steps_interactive.pm</a></div><div class='hunk'>@@ -169,6 +169,11 @@ sub selectMouse {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> $o->setup_thiskind('SERIAL_USB', !$::expert, 0) if $o->{mouse}{device} eq "usbmouse";</div><div class='add'>+ eval { </div><div class='add'>+ devices::make("usbmouse");</div><div class='add'>+ modules::load("usbmouse");</div><div class='add'>+ modules::load("mousedev");</div><div class='add'>+ } if $o->{mouse}{device} eq "usbmouse";</div><div class='ctx'> </div><div class='ctx'> $o->SUPER::selectMouse;</div><div class='ctx'> }</div><div class='head'>diff --git a/perl-install/modules.pm b/perl-install/modules.pm<br/>index 05a1bb8d6..bb6cd2216 100644<br/>--- a/<a href='/software/drakx-backup-do-not-use/tree/perl-install/modules.pm?h=topic/MDK-10-update&id=60225ecd25a9879c5484e4d65f2e1c05388010b3'>perl-install/modules.pm</a><br/>+++ b/<a href='/software/drakx-backup-do-not-use/tree/perl-install/modules.pm?h=topic/MDK-10-update&id=21f753634113afa55eda54a495017c5eef8fc462'>perl-install/modules.pm</a></div><div class='hunk'>@@ -139,7 +139,7 @@ arch() =~ /^sparc/ ? (</div><div class='ctx'> "sd_mod" => "sd_mod",</div><div class='ctx'> "ide-mod" => "ide-mod",</div><div class='ctx'> "ide-probe" => "ide-probe",</div><div class='del'>- "ide-probe-mod" => "ide-probe-mod",</div><div class='add'>+#- "ide-probe-mod" => "ide-probe-mod",</div><div class='ctx'> }],</div><div class='ctx'> [ 'disk', {</div><div class='ctx'> arch() =~ /^sparc/ ? (</div></td></tr></table></div> <!-- class=content --> <div class='footer'>generated by <a href='https://git.zx2c4.com/cgit/about/'>cgit v1.2.1</a> (<a href='https://git-scm.com/'>git 2.21.0</a>) at 2025-02-15 21:12:01 +0000</div> </div> <!-- id=cgit --> </body> </html>