From 082eec8ac6a9f4c81cb02cada1295bfc30588dc4 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 11 Oct 2001 16:17:35 +0000
Subject: ensure postInstallNonRooted is done *before* ejecting cdrom

---
 perl-install/install2.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'perl-install/install2.pm')

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") };
 
-- 
cgit v1.2.1