diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-10-03 15:13:44 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-10-03 15:13:44 +0000 |
| commit | a3912a424feb65f9379fa85e387a8dc6a0467bee (patch) | |
| tree | 2919ec04d704dc4bce29097458e0d04cafaa4631 | |
| parent | 194f2245a3621c84d46ffedc146b1e51c8d8191c (diff) | |
| download | drakx-backup-do-not-use-a3912a424feb65f9379fa85e387a8dc6a0467bee.tar drakx-backup-do-not-use-a3912a424feb65f9379fa85e387a8dc6a0467bee.tar.gz drakx-backup-do-not-use-a3912a424feb65f9379fa85e387a8dc6a0467bee.tar.bz2 drakx-backup-do-not-use-a3912a424feb65f9379fa85e387a8dc6a0467bee.tar.xz drakx-backup-do-not-use-a3912a424feb65f9379fa85e387a8dc6a0467bee.zip | |
*** empty log message ***
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | perl-install/ChangeLog | 6 | ||||
| -rw-r--r-- | perl-install/fs.pm | 2 | ||||
| -rw-r--r-- | perl-install/install2.pm | 2 |
4 files changed, 9 insertions, 2 deletions
@@ -29,6 +29,7 @@ install: build autoboot rescue ifeq (alpha,$(ARCH)) cp -f $(BOOT_RDZ) $(ROOTDEST)/boot cp -f vmlinux.gz $(ROOTDEST)/boot/instboot.gz + install -m 0755 live_update $(ROOTDEST)/live_update # sudo install -d /mnt/loop # for i in $(ROOTDEST)/images/disks/*; do \ # sudo mount $$i /mnt/loop -o loop ;\ diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index a645c39c4..9c7aa998e 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,3 +1,9 @@ +2000-10-03 François Pons <fpons@mandrakesoft.com> + + * fs.pm: removed no more used log. + + * install2.pm: add exit button if live upgrade. + 2000-10-03 DrakX <install@linux-mandrake.com> * snapshot uploaded diff --git a/perl-install/fs.pm b/perl-install/fs.pm index d29d9d095..83f4676d5 100644 --- a/perl-install/fs.pm +++ b/perl-install/fs.pm @@ -54,7 +54,7 @@ sub check_mounted($) { open H, "/proc/swaps"; foreach (<F>, <G>, <H>) { foreach my $p (@$fstab) { - /$p->{device}\s+([^\s]*)\s+/ and $p->{mntpoint} = $1, $p->{isMounted} = $p->{isFormatted} = 1, print STDERR "ok for $p->{mntpoint} with mounted=$p->{isMounted}\n"; + /$p->{device}\s+([^\s]*)\s+/ and $p->{mntpoint} = $1, $p->{isMounted} = $p->{isFormatted} = 1; } } } diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 533d9fd51..2f3fd70f0 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -62,7 +62,7 @@ arch() !~ /alpha/ ? ( arch() !~ /alpha/ ? ( generateAutoInstFloppy => [ __("Auto install floppy"), 1, 1, '!$::expert || $o->{lnx4win}', "installPackages" ], ) : (), - exitInstall => [ __("Exit install"), 0, 0, '$::beginner' ], + exitInstall => [ __("Exit install"), 0, 0, '$::beginner && !$::live' ], ); for (my $i = 0; $i < @installSteps; $i += 2) { my %h; @h{@installStepsFields} = @{ $installSteps[$i + 1] }; |