From bff2e783f7d82e9450d38f931820f95f98012e58 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 10 Nov 1999 02:20:32 +0000 Subject: no_comment --- docs/TODO | 24 +++++++++++++----------- perl-install/install2.pm | 6 +++--- perl-install/install_any.pm | 13 ++++++------- perl-install/install_steps.pm | 7 +++---- perl-install/install_steps_interactive.pm | 2 -- perl-install/raid.pm | 5 +++-- 6 files changed, 28 insertions(+), 29 deletions(-) diff --git a/docs/TODO b/docs/TODO index f43eaf8cb..b3604ba85 100644 --- a/docs/TODO +++ b/docs/TODO @@ -8,6 +8,7 @@ is configureNetworkNet needed with dhcp/bootp? X configuration and bootloader in kickstart (pix)diskdrake +auto_partitions text install @@ -28,18 +29,7 @@ suggested partition tables must be better foreach installClass (fpons)pb with dependencies ``missing'': icewm do not require XFree86 and so you can have icewm but no X server -(fpons)modem config - -(done,pix)kudzu or not in miscellaneous - -(done,pix)warn the user if not enough ram to fulfill install - -(done,fpons)test after printer config - -(done,pix)ask for more than the memory size detected - -------------------------------------------------------------------------------- -call kudzu in batch to initialize its list XFdrake chooseResolutions with ask_from_list do not permit ``Show all'' @@ -95,3 +85,15 @@ diskdrake should warn if nb_ide_parts > 63, nb_scsi_parts > 15 (?)strange: no scsi of type 'fd', only 'tape' + +(done,pix)kudzu or not in miscellaneous + +(done,pix)warn the user if not enough ram to fulfill install + +(done,fpons)test after printer config + +(done,pix)ask for more than the memory size detected + +(done,fpons)modem config + +(done,pix)call kudzu in batch to initialize its list diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 71def4178..574b59744 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -289,7 +289,7 @@ sub partitionDisks { my $ok = fsedit::get_root($o->{fstab} || []) ? 1 : install_any::getHds($o); my $auto = $ok && !$o->{partitioning}{readonly} && - ($o->{partitioning}{auto_allocate} || $::beginner && fsedit::get_fstab(@{$o->{hds}}) < 4); + ($o->{partitioning}{auto_allocate} || $::beginner && fsedit::get_fstab(@{$o->{hds}}) < 3); eval { fsedit::auto_allocate($o->{hds}, $o->{partitions}) } if $auto; @@ -355,7 +355,6 @@ sub miscellaneous { $o->miscellaneous($_[0]); addToBeDone { install_any::fsck_option(); -#-GOLD run_program::rooted($o->{prefix}, "chkconfig --del kudzu") unless $o->{miscellaneous}{kudzu}; } 'doInstallStep'; } @@ -479,7 +478,7 @@ sub main { # kickstart => sub { $::auto_install = 1; $cfg = $v; }, auto_install => sub { $::auto_install = 1; $cfg = $v; }, simple_themes => sub { $o->{simple_themes} = 1 }, - alawindows => sub { $o->{security} = $o->{partitioning}{clearall} = 1; $o->{bootloader}{crushMbr} = 1 }, + alawindows => sub { $o->{security} = 0; $o->{partitioning}{clearall} = 1; $o->{bootloader}{crushMbr} = 1 }, g_auto_install => sub { $::testing = $::g_auto_install = 1; $o->{partitioning}{auto_allocate} = 1 }, }}{lc $n}; &$f if $f; } %cmdline; @@ -534,6 +533,7 @@ sub main { add2hash(network::findIntf($o->{intf} ||= [], $l->{DEVICE}), $l); } + eval { run_program::run("rmmod", "vfat") }; modules::load_deps("/modules/modules.dep"); modules::read_stage1_conf("/tmp/conf.modules"); modules::read_already_loaded(); diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index ef36e6fca..78f3d51ca 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -331,13 +331,11 @@ sub killCardServices { $pid and kill(15, $pid); #- send SIGTERM } -sub unlockCdroms() { - ioctl detect_devices::tryOpen($_->{device}), c::CDROM_LOCKDOOR(), 0 - foreach detect_devices::cdroms(); -} sub ejectCdrom() { - eval { ioctl detect_devices::tryOpen($_), c::CDROMEJECT(), 1 } - foreach map { first split } grep { m|/tmp/rhimage| } cat_("/proc/mounts"); + cat_("/proc/mounts") =~ m|/tmp/(\S+)\s+/tmp/rhimage|; + my $f = eval { detect_devices::tryOpen($1) } or next; + ioctl $f, c::CDROM_LOCKDOOR(), 0; + ioctl $f, c::CDROMEJECT(), 1; } sub setupFB { @@ -408,6 +406,7 @@ sub loadO { -e $f or $f .= ".pl"; $o = loadO($O, $f); fs::umount("/mnt") unless $::testing; + eval { run_program::run("rmmod", "vfat") }; } else { -e $f or $f .= ".pl"; { @@ -430,6 +429,6 @@ sub pkg_install { } sub fsck_option() { - my $y = $::o->{security} < 3 && $::beginner && "-y "; + my $y = $::o->{security} < 3 && $::beginner ? "-y " : ""; substInFile { s/^(\s*fsckoptions="?)(-y )?/$1$y/ } "$::o->{prefix}/etc/rc.d/rc.sysinit"; } diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 8f3af44ef..b3bc59a17 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -223,6 +223,8 @@ sub afterInstallPackages($) { #- why not? cuz weather is nice today :-) [pixel] sync(); sync(); + run_program::rooted($o->{prefix}, "kudzu", "-q"); # -q <=> fermetagueuleconnard + $o->pcmciaConfig(); } @@ -494,10 +496,7 @@ sub miscellaneous { } #------------------------------------------------------------------------------ -sub exitInstall { - install_any::unlockCdroms; - install_any::ejectCdrom; -} +sub exitInstall { install_any::ejectCdrom } #-###################################################################################### #- Wonderful perl :( diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 78c7c3ab1..c23709907 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -864,13 +864,11 @@ sub miscellaneous { [ _("Do you have a laptop?"), _("Use hard drive optimizations?"), _("Choose security level"), -#-GOLD _("Use kudzu"), _("Precise ram size if needed (found %d MB)", availableRam / 1024), ], [ { val => \$u->{LAPTOP}, type => 'bool' }, { val => \$u->{HDPARM}, type => 'bool', text => _("(may cause disk problems)") }, { val => \$s, list => [ map { $l{$_} } ikeys %l ] }, -#-GOLD { val => \$u->{kudzu}, type => 'bool' }, \$u->{memsize}, ], complete => sub { diff --git a/perl-install/raid.pm b/perl-install/raid.pm index 5ee6f9c9d..a9a493f7a 100644 --- a/perl-install/raid.pm +++ b/perl-install/raid.pm @@ -43,7 +43,6 @@ sub delete($$) { my ($raid, $nb) = @_; $nb = nb($nb); - run_program::run("raidstop", devices::make($raid->[$nb]{device})); delete $_->{raid} foreach @{$raid->[$nb]{disks}}; $raid->[$nb] = undef; } @@ -61,6 +60,7 @@ sub changeNb($$$) { sub removeDisk($$) { my ($raid, $part) = @_; my $nb = nb($part->{raid}); + run_program::run("raidstop", devices::make($part->{device})); delete $part->{raid}; @{$raid->[$nb]{disks}} = grep { $_ != $part } @{$raid->[$nb]{disks}}; update($raid->[$nb]); @@ -127,7 +127,6 @@ sub make($$) { run_program::run("raidstop", $dev); &write($raid, "/etc/raidtab"); run_program::run("mkraid", "--really-force", $dev); - run_program::run("raidstart", $dev); } sub format_part($$) { @@ -157,4 +156,6 @@ sub prepare_prefixed($$) { } } +sub stopAll() { run_program::run("raidstop", devices::make("md$_")) foreach 0..7 } + 1; -- cgit v1.2.1