diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-10-11 16:17:35 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-10-11 16:17:35 +0000 |
| commit | 082eec8ac6a9f4c81cb02cada1295bfc30588dc4 (patch) | |
| tree | 1bc689e0bed8ef3b72fb6581399ee3b323734115 | |
| parent | 057a18f559cf59639dfce156e69eb703fe77a0ad (diff) | |
| download | drakx-backup-do-not-use-082eec8ac6a9f4c81cb02cada1295bfc30588dc4.tar drakx-backup-do-not-use-082eec8ac6a9f4c81cb02cada1295bfc30588dc4.tar.gz drakx-backup-do-not-use-082eec8ac6a9f4c81cb02cada1295bfc30588dc4.tar.bz2 drakx-backup-do-not-use-082eec8ac6a9f4c81cb02cada1295bfc30588dc4.tar.xz drakx-backup-do-not-use-082eec8ac6a9f4c81cb02cada1295bfc30588dc4.zip | |
ensure postInstallNonRooted is done *before* ejecting cdrom
| -rw-r--r-- | perl-install/install2.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 165d69b5a..ccfe1e526 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -561,12 +561,16 @@ sub main { } install_any::clean_postinstall_rpms(); install_any::log_sizes($o); - install_any::ejectCdrom(); install_any::remove_advertising($o); - install_any::write_fstab($o); modules::write_conf($o->{prefix}); + #- mainly for auto_install's + run_program::run("bash", "-c", $o->{postInstallNonRooted}) if $o->{postInstallNonRooted}; + run_program::rooted($o->{prefix}, "sh", "-c", $o->{postInstall}) if $o->{postInstall}; + + install_any::ejectCdrom(); + #- to ensure linuxconf doesn't cry against those files being in the future foreach ('/etc/modules.conf', '/etc/crontab', '/etc/sysconfig/mouse', '/etc/sysconfig/network', '/etc/X11/fs/config') { my $now = time - 24 * 60 * 60; @@ -579,10 +583,6 @@ sub main { -e "$o->{prefix}/usr/sbin/urpmi.update" or eval { rm_rf("$o->{prefix}/var/lib/urpmi") }; - #- mainly for auto_install's - run_program::run("bash", "-c", $o->{postInstallNonRooted}) if $o->{postInstallNonRooted}; - run_program::rooted($o->{prefix}, "sh", "-c", $o->{postInstall}) if $o->{postInstall}; - #- have the really bleeding edge ddebug.log eval { cp_af("/tmp/ddebug.log", "$o->{prefix}/root") }; |