diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-03-21 21:38:19 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-03-21 21:38:19 -0400 |
| commit | 49b350fafc2c3ea1db66461b73d4e304cd13ec92 (patch) | |
| tree | 9b9b1a4a383b5175241ae6b91b83de0590f13983 /gnu/installer | |
| parent | 03b5668a035ba96c9690476078c5ee1d5793f3e2 (diff) | |
| parent | e584a093f943be216fdc93895281fde835836b8d (diff) | |
| download | guix-49b350fafc2c3ea1db66461b73d4e304cd13ec92.tar.gz | |
Merge branch 'master' into staging.
Diffstat (limited to 'gnu/installer')
| -rw-r--r-- | gnu/installer/connman.scm | 2 | ||||
| -rw-r--r-- | gnu/installer/parted.scm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gnu/installer/connman.scm b/gnu/installer/connman.scm index 2f33b58453..d21272036f 100644 --- a/gnu/installer/connman.scm +++ b/gnu/installer/connman.scm @@ -287,7 +287,7 @@ list so that each keys of a given technology are gathered in a separate list." (define (connman-online?) (let ((state (connman-state))) - (eq? state 'online))) + (memq state '(ready online)))) (define (connman-connect-with-auth service password-proc) "Connect to the given SERVICE with the password returned by calling diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm index e33ef5f8fd..94ef9b42bc 100644 --- a/gnu/installer/parted.scm +++ b/gnu/installer/parted.scm @@ -348,7 +348,7 @@ fail. See rereadpt function in wipefs.c of util-linux for an explanation." (define (installer-root-partition-path) "Return the root partition path, or #f if it could not be detected." (let* ((cmdline (linux-command-line)) - (root (find-long-option "--root" cmdline))) + (root (find-long-option "root" cmdline))) (and root (or (and (access? root F_OK) root) (find-partition-by-label root) |