summaryrefslogtreecommitdiff
path: root/gnu/installer
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-02-19 12:08:40 +0100
committerLudovic Courtès <ludo@gnu.org>2020-02-22 00:45:42 +0100
commit5c04b00cf463a543b8ffc9eb55991f6b4cc145dd (patch)
treed8bc8b028c606a76f3c78a2872dfdd859d5a77ec /gnu/installer
parent2cf65e1d543407bc7db43e7c7d39a215907efebc (diff)
installer: Log important bits to syslog.
* gnu/installer.scm (installer-program): Log crashes with 'syslog'. * gnu/installer/parted.scm (luks-format-and-open, luks-close) (mount-user-partitions, umount-user-partitions): Add 'syslog' calls. * gnu/installer/steps.scm (run-installer-steps): Log the running step with 'syslog'. * gnu/installer/utils.scm (run-shell-command): Add calls to 'syslog'.
Diffstat (limited to 'gnu/installer')
-rw-r--r--gnu/installer/parted.scm7
-rw-r--r--gnu/installer/steps.scm1
-rw-r--r--gnu/installer/utils.scm4
3 files changed, 11 insertions, 1 deletions
diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm
index c2b02c9281..6c805cc053 100644
--- a/gnu/installer/parted.scm
+++ b/gnu/installer/parted.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018, 2019 Mathieu Othacehe <m.othacehe@gmail.com>
-;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
@@ -1070,6 +1070,8 @@ USER-PARTITION if it is encrypted, or the plain file-name otherwise."
(call-with-luks-key-file
password
(lambda (key-file)
+ (syslog "formatting and opening LUKS entry ~s at ~s~%"
+ label file-name)
(system* "cryptsetup" "-q" "luksFormat" file-name key-file)
(system* "cryptsetup" "open" "--type" "luks"
"--key-file" key-file file-name label)))))
@@ -1077,6 +1079,7 @@ USER-PARTITION if it is encrypted, or the plain file-name otherwise."
(define (luks-close user-partition)
"Close the encrypted partition pointed by USER-PARTITION."
(let ((label (user-partition-crypt-label user-partition)))
+ (syslog "closing LUKS entry ~s~%" label)
(system* "cryptsetup" "close" label)))
(define (format-user-partitions user-partitions)
@@ -1150,6 +1153,7 @@ respective mount-points."
(file-name
(user-partition-upper-file-name user-partition)))
(mkdir-p target)
+ (syslog "mounting ~s on ~s~%" file-name target)
(mount file-name target mount-type)))
sorted-partitions)))
@@ -1165,6 +1169,7 @@ respective mount-points."
(target
(string-append (%installer-target-dir)
mount-point)))
+ (syslog "unmounting ~s~%" target)
(umount target)
(when crypt-label
(luks-close user-partition))))
diff --git a/gnu/installer/steps.scm b/gnu/installer/steps.scm
index 4e90f32f95..b2fc819d89 100644
--- a/gnu/installer/steps.scm
+++ b/gnu/installer/steps.scm
@@ -177,6 +177,7 @@ return the accumalated result so far."
#:done-steps '())))))
((installer-step-break? c)
(reverse result)))
+ (syslog "running step '~a'~%" (installer-step-id step))
(let* ((id (installer-step-id step))
(compute (installer-step-compute step))
(res (compute result done-steps)))
diff --git a/gnu/installer/utils.scm b/gnu/installer/utils.scm
index a5f390e7a2..842bd02ced 100644
--- a/gnu/installer/utils.scm
+++ b/gnu/installer/utils.scm
@@ -89,9 +89,13 @@ COMMAND exited successfully, #f otherwise."
(format (current-error-port)
(G_ "Command failed with exit code ~a.~%")
(invoke-error-exit-status c))
+ (syslog "command ~s failed with exit code ~a"
+ command (invoke-error-exit-status c))
(pause)
#f))
+ (syslog "running command ~s~%" command)
(invoke "bash" "--init-file" file)
+ (syslog "command ~s succeeded~%" command)
(newline)
(pause)
#t))))