summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-02-28 22:22:46 +0000
committerOlivier Blin <oblin@mandriva.com>2008-02-28 22:22:46 +0000
commita3715cc453d4f8de5563359ed3bd30d2cfd32929 (patch)
treef4e7af0bf82cfa3f8bd8ce481984bc7eac4ec2e8
parent109aa4b0bfef14dff9c78cece7d3ffb2f550592b (diff)
downloaddrakx-backup-do-not-use-a3715cc453d4f8de5563359ed3bd30d2cfd32929.tar
drakx-backup-do-not-use-a3715cc453d4f8de5563359ed3bd30d2cfd32929.tar.gz
drakx-backup-do-not-use-a3715cc453d4f8de5563359ed3bd30d2cfd32929.tar.bz2
drakx-backup-do-not-use-a3715cc453d4f8de5563359ed3bd30d2cfd32929.tar.xz
drakx-backup-do-not-use-a3715cc453d4f8de5563359ed3bd30d2cfd32929.zip
create fs::any::prepare_minimal_root() out of install::install2::formatPartitions() (to be used in draklive-install
-rw-r--r--perl-install/fs/any.pm16
-rw-r--r--perl-install/install/install2.pm12
2 files changed, 17 insertions, 11 deletions
diff --git a/perl-install/fs/any.pm b/perl-install/fs/any.pm
index 00d4639a0..d523a6943 100644
--- a/perl-install/fs/any.pm
+++ b/perl-install/fs/any.pm
@@ -88,4 +88,20 @@ sub create_minimal_files() {
chmod 0666, "$::prefix/dev/null";
}
+sub prepare_minimal_root {
+ my ($all_hds) = @_;
+
+ fs::any::create_minimal_files();
+
+ eval { fs::mount::mount('none', "$::prefix/proc", 'proc') };
+ eval { fs::mount::mount('none', "$::prefix/sys", 'sysfs') };
+ eval { fs::mount::usbfs($::prefix) };
+
+ #- needed by lilo
+ if (-d '/dev/mapper' && !$::local_install) {
+ my @vgs = map { $_->{VG_name} } @{$all_hds->{lvms}};
+ -e "/dev/$_" and cp_af("/dev/$_", "$::prefix/dev") foreach 'mapper', @vgs;
+ }
+}
+
1;
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index b894b6b8b..281116c70 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -177,17 +177,7 @@ sub formatPartitions {
eval { rm_rf("$::prefix/var/lib/rpm") };
}
- fs::any::create_minimal_files();
-
- eval { fs::mount::mount('none', "$::prefix/proc", 'proc') };
- eval { fs::mount::mount('none', "$::prefix/sys", 'sysfs') };
- eval { fs::mount::usbfs($::prefix) };
-
- #- needed by lilo
- if (-d '/dev/mapper' && !$::local_install) {
- my @vgs = map { $_->{VG_name} } @{$o->{all_hds}{lvms}};
- -e "/dev/$_" and cp_af("/dev/$_", "$::prefix/dev") foreach 'mapper', @vgs;
- }
+ fs::any::prepare_minimal_root($o->{all_hds});
install::any::screenshot_dir__and_move();
install::any::move_compressed_image_to_disk($o);