From ca13e0c3a823fec4196635dd8d132960b7668ddd Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Mon, 16 Mar 2020 23:02:20 +0000
Subject: Record installer log messages and store in /root/drakx.

---
 NEWS             |  2 ++
 draklive-install | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/NEWS b/NEWS
index 9ef9e88..2b2effb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- record installer log messages and store in /root/drakx 
+
 2.23
 
 - remove dependency on udisks (mga#24949)
diff --git a/draklive-install b/draklive-install
index 91e350e..10b1190 100755
--- a/draklive-install
+++ b/draklive-install
@@ -22,10 +22,35 @@ use feature qw(state);
 use File::Basename;
 use ugtk3;
 
+my $logfile = '/tmp/draklive-install.log';
+{
+    package log;
+
+    my $LOG;
+
+    sub l {
+        if (!$LOG) {
+            open $LOG, '>', $logfile;
+            select((select($LOG),  $| = 1)[0]);
+        }
+        print $LOG "* ", @_, "\n";
+    }
+}
+
 ($::rootwidth, $::rootheight) = (Gtk3::Gdk::Screen::width, Gtk3::Gdk::Screen::height);
 $::real_windowwidth  = $::rootwidth  > 800 ? 750 : 600;
 $::real_windowheight = $::rootheight > 600 ? 500 : 400;
 
+chomp(my $basedev = cat_('/run/mgalive/basedev'));
+if ($basedev) {
+    mkdir_p('/tmp/basedev');
+    log::l(run_program::get_stdout('blkid', '-s', 'LABEL', $basedev));
+    if (system('mount', $basedev, '/tmp/basedev') == 0) {
+        log::l('ISO date: ' . cat_('/tmp/basedev/DATE.txt')) if -e '/tmp/basedev/DATE.txt';
+        system('umount', '/tmp/basedev');
+    }
+}
+
 {
     use diskdrake::interactive;
     package diskdrake::interactive;
@@ -257,6 +282,7 @@ sub get_total_size {
 
 sub sync_logs() {
     cp_af('/var/log', $::prefix . '/var');
+    cp_f($logfile, $::prefix . '/root/drakx');
 }
 
 sub copy_root {
-- 
cgit v1.2.1