From 7b2b30957394435f75ed406c248f8a21393a806c Mon Sep 17 00:00:00 2001 From: Eugeni Dodonov Date: Wed, 2 Feb 2011 16:20:34 +0000 Subject: do not copy files which live on separate partitions within fs::any::prepare_minimal_root readd missing 2010.2 installer logo --- perl-install/NEWS | 3 +++ perl-install/fs/any.pm | 2 +- perl-install/install/pixmaps/left-background.png | Bin 81795 -> 79868 bytes perl-install/standalone.pm | 9 ++++++++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index 1a0f3560b..0d40db962 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- do not copy files which live on separate partitions within + fs::any::prepare_minimal_root +- keep log of cp_afx - cpufreq: add support for Athlon/Phenom II processors (#58477) Version 13.39 - 24 November 2010 diff --git a/perl-install/fs/any.pm b/perl-install/fs/any.pm index 50d03b656..b1fc1f18e 100644 --- a/perl-install/fs/any.pm +++ b/perl-install/fs/any.pm @@ -98,7 +98,7 @@ sub prepare_minimal_root { eval { fs::mount::usbfs($::prefix) }; # copy all needed devices, for bootloader install and mkinitrd - cp_af("/dev", "$::prefix"); + cp_afx("/dev", "$::prefix"); } sub getAvailableSpace { diff --git a/perl-install/install/pixmaps/left-background.png b/perl-install/install/pixmaps/left-background.png index c929f9860..e0a6f9b33 100644 Binary files a/perl-install/install/pixmaps/left-background.png and b/perl-install/install/pixmaps/left-background.png differ diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm index 2d7986c24..0c2f1f6f0 100644 --- a/perl-install/standalone.pm +++ b/perl-install/standalone.pm @@ -184,7 +184,7 @@ foreach (@ARGV) { my $standalone_name; sub explanations { log::explanations("@_") } -our @common_functs = qw(renamef linkf symlinkf output substInFile mkdir_p rm_rf cp_af touch setVarsInSh setExportedVarsInSh setExportedVarsInCsh update_gnomekderc); +our @common_functs = qw(renamef linkf symlinkf output substInFile mkdir_p rm_rf cp_af cp_afx touch setVarsInSh setExportedVarsInSh setExportedVarsInCsh update_gnomekderc); our @builtin_functs = qw(chmod chown __exit exit unlink link symlink rename system); our @drakx_modules = qw(Xconfig::card Xconfig::default Xconfig::main Xconfig::monitor Xconfig::parse Xconfig::proprietary Xconfig::resolution_and_depth Xconfig::screen Xconfig::test Xconfig::various Xconfig::xfree any bootloader bootlook c commands crypto detect_devices devices diskdrake diskdrake::hd_gtk diskdrake::interactive diskdrake::removable diskdrake::removable_gtk diskdrake::smbnfs_gtk fs fsedit http keyboard lang log loopback lvm modules::parameters modules mouse my_gtk network network::adsl network::ethernet network::connection network::isdn_consts network::isdn network::modem network::netconnect network::network fs::remote::nfs fs::remote::smb network::tools partition_table partition_table_bsd partition_table::dos partition_table::empty partition_table::gpt partition_table::mac partition_table::raw partition_table::sun printer printerdrake proxy raid run_program scanner services steps swap timezone network::drakfirewall network::shorewall); @@ -277,6 +277,13 @@ sub cp_af { return $retval; } +sub cp_afx { + my $retval = MDK::Common::File::cp_afx(@_); + my $dest = pop @_; + explanations "copied recursively @_ to $dest, staying on same partition"; + return $retval; +} + sub touch { explanations "touched file @_"; goto &MDK::Common::File::touch; -- cgit v1.2.1