summaryrefslogtreecommitdiffstats
path: root/perl-install/install_any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-09-16 18:35:07 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-09-16 18:35:07 +0000
commit8c7c8f9e1497f80cbe9bbdc1bf0b8552b7dd88cb (patch)
tree9521630ef9f9857cc3bb5c5ce606a958de4516cf /perl-install/install_any.pm
parentcf616f12521a0f539e4f02f70d0210beb0102320 (diff)
downloaddrakx-8c7c8f9e1497f80cbe9bbdc1bf0b8552b7dd88cb.tar
drakx-8c7c8f9e1497f80cbe9bbdc1bf0b8552b7dd88cb.tar.gz
drakx-8c7c8f9e1497f80cbe9bbdc1bf0b8552b7dd88cb.tar.bz2
drakx-8c7c8f9e1497f80cbe9bbdc1bf0b8552b7dd88cb.tar.xz
drakx-8c7c8f9e1497f80cbe9bbdc1bf0b8552b7dd88cb.zip
use new mkdir_p, rm_rf and cp_af from MDK::Common
Diffstat (limited to 'perl-install/install_any.pm')
-rw-r--r--perl-install/install_any.pm17
1 files changed, 7 insertions, 10 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index a82ebe5b9..bb1271cab 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -168,11 +168,10 @@ sub setup_postinstall_rpms($$) {
$postinstall_rpms = "$prefix/usr/postinstall-rpm";
require pkgs;
- require commands;
log::l("postinstall rpms directory set to $postinstall_rpms");
clean_postinstall_rpms(); #- make sure in case of previous upgrade problem.
- commands::mkdir_('-p', $postinstall_rpms);
+ mkdir_p($postinstall_rpms);
#- compute closure of unselected package that may be copied,
#- don't complain if package does not exists as it may happen
@@ -191,15 +190,14 @@ sub setup_postinstall_rpms($$) {
#- copy the package files in the postinstall RPMS directory.
#- last arg is default medium '' known as the CD#1.
pkgs::extractHeaders($prefix, \@toCopy, $packages->{mediums}{1});
- commands::cp((map { "/tmp/image/" . relGetFile(pkgs::packageFile($_)) } @toCopy), $postinstall_rpms);
+ cp_af((map { "/tmp/image/" . relGetFile(pkgs::packageFile($_)) } @toCopy), $postinstall_rpms);
log::l("copying Auto Install Floppy");
getAndSaveInstallFloppy($::o, "$postinstall_rpms/auto_install.img");
}
sub clean_postinstall_rpms() {
- require commands;
- $postinstall_rpms and -d $postinstall_rpms and commands::rm('-rf', $postinstall_rpms);
+ $postinstall_rpms and -d $postinstall_rpms and rm_rf($postinstall_rpms);
}
@@ -698,8 +696,7 @@ sub getAndSaveInstallFloppy {
my ($o, $where) = @_;
if ($postinstall_rpms && -d $postinstall_rpms && -r "$postinstall_rpms/auto_install.img") {
log::l("getAndSaveInstallFloppy: using file saved as $postinstall_rpms/auto_install.img");
- require commands;
- commands::cp("-f", "$postinstall_rpms/auto_install.img", $where);
+ cp_af("$postinstall_rpms/auto_install.img", $where);
} else {
my $image = cat_("/proc/cmdline") =~ /pcmcia/ ? "pcmcia" :
${{ disk => 'hd', cdrom => 'cdrom', ftp => 'network', nfs => 'network', http => 'network' }}{$o->{method}};
@@ -722,10 +719,9 @@ sub getAndSaveAutoInstallFloppy {
getAndSaveInstallFloppy($o, $imagefile) or return;
devices::make($_) foreach qw(/dev/loop6 /dev/ram);
- require commands;
run_program::run("losetup", "/dev/loop6", $imagefile);
fs::mount("/dev/loop6", $mountdir, "romfs", 'readonly');
- commands::cp("-f", $mountdir, $workdir);
+ cp_af($mountdir, $workdir);
fs::umount($mountdir);
run_program::run("losetup", "-d", "/dev/loop6");
@@ -744,9 +740,10 @@ sub getAndSaveAutoInstallFloppy {
fs::mount("/dev/ram", $mountdir, 'romfs', 0);
run_program::run("silo", "-r", $mountdir, "-F", "-i", "/fd.b", "-b", "/second.b", "-C", "/silo.conf");
fs::umount($mountdir);
+ require commands;
commands::dd("if=/dev/ram", "of=$where", "bs=1440", "count=1024");
- commands::rm("-rf", $workdir, $mountdir, $imagefile);
+ rm_rf($workdir, $mountdir, $imagefile);
} else {
my $imagefile = "$o->{prefix}/tmp/autoinst.img";
my $mountdir = "$o->{prefix}/tmp/aif-mount"; -d $mountdir or mkdir $mountdir, 0755;