summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-12-22 11:24:41 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-12-22 11:24:41 +0000
commit82cdd15f90d5e9116652e76e600cc772f35df779 (patch)
tree0e531ab11f0ccba7380b4a1824e3be4f12242348
parentc49ce4d2b9e6d2ee1582154d5920c51afbdd2412 (diff)
downloaddrakx-backup-do-not-use-82cdd15f90d5e9116652e76e600cc772f35df779.tar
drakx-backup-do-not-use-82cdd15f90d5e9116652e76e600cc772f35df779.tar.gz
drakx-backup-do-not-use-82cdd15f90d5e9116652e76e600cc772f35df779.tar.bz2
drakx-backup-do-not-use-82cdd15f90d5e9116652e76e600cc772f35df779.tar.xz
drakx-backup-do-not-use-82cdd15f90d5e9116652e76e600cc772f35df779.zip
commit symlink /tmp/image /tmp/rhimage
-rw-r--r--perl-install/install2.pm2
-rw-r--r--perl-install/interactive_gtk.pm3
2 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 974bfb531..29c251ab2 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -528,6 +528,8 @@ sub main {
$o->{mkbootdisk} = 0;
}
unless ($::testing || $::live) {
+ symlink "image", "/tmp/rhimage"; #- for compatibility with new mdk-stage1
+
unlink $_ foreach ( $o->{pcmcia} ? () : ("/sbin/install"), #- #- install include cardmgr!
"/modules/modules.cgz",
"/sbin/insmod", "/sbin/rmmod",
diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm
index b0447b539..8661e2ed3 100644
--- a/perl-install/interactive_gtk.pm
+++ b/perl-install/interactive_gtk.pm
@@ -351,6 +351,9 @@ sub ask_from_entries_refW {
$ok
));
widget($widgets[0],$val->[0])->grab_focus();
+
+# mapn { $_[0]{expert} and $_[1]->hide } $val, \@widgets, $l;
+
if ($hcallback{complete}) {
my $callback = sub {
my ($error, $focus) = &{$hcallback{complete}};