summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-02-24 14:39:04 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-02-24 14:39:04 +0000
commit78aef7f66bb62da23ff87ba2f24fb5e33637c0be (patch)
treeb1d68271287e98d5ba9c7ca648795c28de0c85f0
parent752767dd8bb3b25b3566fdc4087b79e2a572d4e9 (diff)
downloaddrakx-78aef7f66bb62da23ff87ba2f24fb5e33637c0be.tar
drakx-78aef7f66bb62da23ff87ba2f24fb5e33637c0be.tar.gz
drakx-78aef7f66bb62da23ff87ba2f24fb5e33637c0be.tar.bz2
drakx-78aef7f66bb62da23ff87ba2f24fb5e33637c0be.tar.xz
drakx-78aef7f66bb62da23ff87ba2f24fb5e33637c0be.zip
no_comment
-rwxr-xr-xmake_boot_img4
-rw-r--r--perl-install/ChangeLog6
-rw-r--r--perl-install/Makefile1
-rw-r--r--perl-install/Xconfigurator.pm2
-rw-r--r--perl-install/install2.pm2
-rw-r--r--perl-install/install_steps.pm3
-rw-r--r--perl-install/install_steps_interactive.pm17
-rw-r--r--perl-install/interactive_gtk.pm2
-rwxr-xr-xtools/alpha/cd/up1000/apb.cfg4
-rwxr-xr-xupdate_kernel2
10 files changed, 26 insertions, 17 deletions
diff --git a/make_boot_img b/make_boot_img
index 0891ff2cd..28f50598a 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -120,8 +120,8 @@ sub boot_img_alpha {
mkdir "$mnt/etc", 0777;
output("$mnt/etc/aboot.conf",
-"0:vmlinux.gz initrd=$type.rdz mdkinst rw ramdisk=32000
-1:vmlinux.gz initrd=$type.rdz mdkinst rw ramdisk=32000 text
+"0:vmlinux.gz initrd=$type.rdz mdkinst rw ramdisk=32000 $type
+1:vmlinux.gz initrd=$type.rdz mdkinst rw ramdisk=32000 text $type
");
_ "sync";
_ "df $mnt";
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index dd37ac52b..46bd89f87 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,7 +1,13 @@
2000-02-24 Pixel <pixel@mandrakesoft.com>
+ * install2.pm (main): moved the ejectCdrom from install_steps::END
+ to here
+
* install_steps_interactive.pm (createBootdisk): fix an error for
non fdX choice of floppy drive
+
+ * install_steps_interactive.pm (setup_thiskind): remove the
+ "defined @l"
2000-02-23 Pixel <pixel@mandrakesoft.com>
diff --git a/perl-install/Makefile b/perl-install/Makefile
index 6e3ed41c7..a092da5fb 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -56,6 +56,7 @@ install_pms: $(DIRS)
get_needed_files: $(DIRS)
# export PERL_INSTALL_TEST=1 ; strace -f -e trace=file -o '| grep -v "(No such file or directory)" | sed -e "s/[^\"]*\"//" -e "s/\".*//" | grep "^/" | grep -v -e "^/tmp" -e "^/home" -e "^/proc" -e "^/var" -e "^/dev" -e "^/etc" -e "^/usr/lib/rpm" > /tmp/list ' $(PERL) -d install2 < /dev/null
perl -pe "s/ARCH/$(ARCH)/g" share/list > /tmp/list
+ perl -pi -e 's/00503/5.660/g' /tmp/list
cat `../tools/specific_arch share/list` >> /tmp/list
find auto -follow -name "*.so" >> /tmp/list
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 8a567234c..65abceaa8 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -495,7 +495,7 @@ sub chooseResolutionsGtk($$;$) {
1, gtkpack(new Gtk::HBox(0,20),
$depth_combo = new Gtk::Combo,
gtkpack_(new Gtk::VBox(0,0),
- map { 0, $w2widget{$_} } ikeys(%w2widget),
+ map {; 0, $w2widget{$_} } ikeys(%w2widget),
),
),
0, gtkadd($W->create_okcancel,
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 23478df31..af40b5a3e 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -643,6 +643,8 @@ sub main {
last if $o->{step} eq 'exitInstall';
}
+ install_any::ejectCdrom();
+
fs::write($o->{prefix}, $o->{fstab}, $o->{manualFstab}, $o->{useSupermount});
modules::write_conf("$o->{prefix}/etc/conf.modules", 'append');
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index db66ebb92..38b21a60f 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -751,9 +751,6 @@ sub cleanIfFailedUpgrade($) {
}
}
-#------------------------------------------------------------------------------
-END { install_any::ejectCdrom }
-
#-######################################################################################
#- Wonderful perl :(
#-######################################################################################
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index e8540b176..f7aa39acf 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1148,19 +1148,22 @@ sub load_thiskind {
modules::add_alias("sound", $c);
}
}
- my @l = eval { modules::load_thiskind($type, sub { $w = wait_load_module($o, $type, @_) }, $pcmcia) };
- $@ and $o->errorInStep($@), return undef;
- @l;
+ modules::load_thiskind($type, sub { $w = wait_load_module($o, $type, @_) }, $pcmcia);
}
#------------------------------------------------------------------------------
sub setup_thiskind {
my ($o, $type, $auto, $at_least_one) = @_;
- # load_thiskind returns undef in case of error
- my @l = $o->load_thiskind($type) if !$::expert || $o->ask_yesorno('', _("Try to find PCI devices?"), 1);
- return if defined @l && $auto && (@l || !$at_least_one);
-
+ my @l;
+ if (!$::expert || $o->ask_yesorno('', _("Try to find PCI devices?"), 1)) {
+ eval { @l = $o->load_thiskind($type) };
+ if ($@) {
+ $o->errorInStep($@);
+ } else {
+ return if $auto && (@l || !$at_least_one);
+ }
+ }
while (1) {
my $msg = @l ?
[ _("Found %s %s interfaces", join(", ", map { $_->[0] } @l), $type),
diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm
index 6e5e8eb4f..d59a1ea15 100644
--- a/perl-install/interactive_gtk.pm
+++ b/perl-install/interactive_gtk.pm
@@ -81,7 +81,7 @@ sub ask_from_treelistW {
foreach my $nb (1 .. @$l) {
if ($tree->node_nth($nb) == $node) {
$tree->focus_row($nb);
- Gtk->idle_add(sub { $tree->moveto($nb, 0, 0.5, 0); 0 });
+ Gtk->idle_add(sub { $tree->node_moveto($node, 0, 0.5, 0); 0 });
last;
}
}
diff --git a/tools/alpha/cd/up1000/apb.cfg b/tools/alpha/cd/up1000/apb.cfg
index 366e42bb4..06614adcb 100755
--- a/tools/alpha/cd/up1000/apb.cfg
+++ b/tools/alpha/cd/up1000/apb.cfg
@@ -1,2 +1,2 @@
-floppy|bootl boot/up1000/up1000.pal boot/instboot.gz root=/dev/fd0 load_ramdisk=1 mdkinst rw ramdisk_size=32000
-floppy_text|bootl boot/up1000/up1000.pal boot/instboot.gz root=/dev/fd0 load_ramdisk=1 mdkinst rw ramdisk_size=32000 text
+floppy|bootl boot\up1000\up1000.pal boot\instboot.gz root=/dev/fd0 load_ramdisk=1 mdkinst rw ramdisk_size=32000
+floppy_text|bootl boot\up1000\up1000.pal boot\instboot.gz root=/dev/fd0 load_ramdisk=1 mdkinst rw ramdisk_size=32000 text
diff --git a/update_kernel b/update_kernel
index 00ace1c9b..e82e97a71 100755
--- a/update_kernel
+++ b/update_kernel
@@ -27,7 +27,7 @@ PCMCIA_INSTALLMODULES="pcmcia_core.o tcic.o ds.o i82365.o"
if [ "$ARCH" == "i386" ]; then
#set 640x480x16 resolution on boot.
cp -f $KERNEL_BOOT_PATH/boot/vmlinuz* vmlinuz
- /usr/sbin/rdev -v vmlinuz 791 #785
+ /usr/sbin/rdev -v vmlinuz 788 #785
cp -f vmlinuz /export/lnx4win
rm -rf install_pcmcia_modules ; install -d install_pcmcia_modules