summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-06-23 14:37:54 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-06-23 15:12:51 +0200
commit2e7cd0b76acfdc63bfaa0043c1f9bb93c4045192 (patch)
tree8889f3491dfa6301d7a5fe21892f0a503e3ea040
parent70fde96d984a903d79f03bf36b596514051bd79d (diff)
downloaddrakx-2e7cd0b76acfdc63bfaa0043c1f9bb93c4045192.tar
drakx-2e7cd0b76acfdc63bfaa0043c1f9bb93c4045192.tar.gz
drakx-2e7cd0b76acfdc63bfaa0043c1f9bb93c4045192.tar.bz2
drakx-2e7cd0b76acfdc63bfaa0043c1f9bb93c4045192.tar.xz
drakx-2e7cd0b76acfdc63bfaa0043c1f9bb93c4045192.zip
(system_info) split it
-rw-r--r--perl-install/install/any.pm6
-rw-r--r--perl-install/install/install2.pm3
2 files changed, 7 insertions, 2 deletions
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 76fefc8b4..92b3bcb2f 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -938,6 +938,12 @@ sub kdemove_desktop_file {
}
}
+sub log_system_info {
+ my ($o) = @_;
+ log::l("second stage install running (", drakx_version($o), ")");
+ log::l(sprintf("Virtualization=%s", detect_devices::virt_technology()));
+}
+
#-###############################################################################
#- auto_install stuff
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index ded0c978c..05fd0b3f1 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -685,8 +685,7 @@ sub main {
$o->{stage2_phys_medium} = install::media::stage2_phys_medium($o->{method});
- log::l("second stage install running (", install::any::drakx_version($o), ")");
- log::l(sprintf("Virtualization=%s", detect_devices::virt_technology()));
+ install::any::log_system_info($o);
eval { touch('/root/non-chrooted-marker.DrakX') }; #- helps distinguishing /root and /mnt/root when we don't know if we are chrooted