Merge lp:~joalif/friendly-recovery/lp1821252 into lp:~ubuntu-core-dev/friendly-recovery/ubuntu

Proposed by Ioanna Alifieraki on 2019-06-21
Status: Merged
Merged at revision: 165
Proposed branch: lp:~joalif/friendly-recovery/lp1821252
Merge into: lp:~ubuntu-core-dev/friendly-recovery/ubuntu
Diff against target: 29 lines (+10/-1)
2 files modified
debian/changelog (+9/-0)
lib/systemd/system-generators/friendly-recovery (+1/-1)
To merge this branch: bzr merge lp:~joalif/friendly-recovery/lp1821252
Reviewer Review Type Date Requested Status
Eric Desrochers 2019-06-21 Pending
Dimitri John Ledkov 2019-06-21 Pending
Ubuntu Core Development Team 2019-06-21 Pending
Review via email: mp+369164@code.launchpad.net

Commit message

Symlink default.taget to earlydir instead of normaldir to be able to access recovery
mode even if default target has been set via systemctl set-default (LP: #1821252).

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2019-02-12 02:31:42 +0000
3+++ debian/changelog 2019-06-21 12:13:26 +0000
4@@ -1,3 +1,12 @@
5+friendly-recovery (0.2.41) UNRELEASED; urgency=medium
6+
7+ [Steven Clarkson]
8+ * Symlink default.taget to earlydir instead of normaldir to be able
9+ to access recovery mode even if default target has been set via
10+ systemctl set-default (LP: #1821252).
11+
12+ -- Ioanna Alifieraki <ioanna-maria.alifieraki@canonical.com> Tue, 21 Jun 2019 12:40:42 +0000
13+
14 friendly-recovery (0.2.40) UNRELEASED; urgency=medium
15
16 * Trim trailing whitespace.
17
18=== modified file 'lib/systemd/system-generators/friendly-recovery'
19--- lib/systemd/system-generators/friendly-recovery 2018-09-24 15:38:48 +0000
20+++ lib/systemd/system-generators/friendly-recovery 2019-06-21 12:13:26 +0000
21@@ -8,7 +8,7 @@
22 for cmdline_arg in "$@"; do
23 if [ "$cmdline_arg" = "recovery" ]
24 then
25- ln -sf /lib/systemd/system/friendly-recovery.target $normaldir/default.target
26+ ln -sf /lib/systemd/system/friendly-recovery.target $earlydir/default.target
27 break
28 fi
29 done

Subscribers

People subscribed via source and target branches