summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2020-03-15 16:44:22 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2020-03-15 17:07:20 +0000
commita776be91453a7a9a212e705453259598ea3851ce (patch)
tree101d1cffbe114473aeb4f0d9641755996ed23cbe /perl-install
parent3458ddbbc94d2a2c5d016e3bac1d14af4b7e8a62 (diff)
downloaddrakx-a776be91453a7a9a212e705453259598ea3851ce.tar
drakx-a776be91453a7a9a212e705453259598ea3851ce.tar.gz
drakx-a776be91453a7a9a212e705453259598ea3851ce.tar.bz2
drakx-a776be91453a7a9a212e705453259598ea3851ce.tar.xz
drakx-a776be91453a7a9a212e705453259598ea3851ce.zip
installer: write ISO volume label to installer log
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/install2.pm7
2 files changed, 7 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 1a4b517ef..796686c6b 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -5,7 +5,7 @@
- partitioning:
o make reformating nilfs2 fses to work
- sync list for modules needing firmware with kernel 5.5
-- write ISO date to installer log
+- write ISO label and date to installer log
Version 18.23 - 25 January 2020
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index d6712b1bc..e410de60c 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -693,7 +693,12 @@ sub main {
$o->{stage2_phys_medium} = install::media::stage2_phys_medium($o->{method});
- log::l('ISO date: ' . cat_('/tmp/media/DATE.txt')) if -e '/tmp/media/DATE.txt';
+ if (-e '/tmp/media/DATE.txt') {
+ my @mount_entry = grep { $_ =~ m,/tmp/media, } cat_('/proc/mounts');
+ my @mount_fields = split(/ /, $mount_entry[0]);
+ log::l(run_program::get_stdout('blkid', '-s', 'LABEL', $mount_fields[0]));
+ log::l('ISO date: ' . cat_('/tmp/media/DATE.txt'));
+ }
install::any::log_system_info($o);