Merge lp:~sergiusens/ubuntu/wily/ubuntu-core-config/panic into lp:ubuntu/wily/ubuntu-core-config

Proposed by Sergio Schvezov
Status: Merged
Approved by: Michael Vogt
Approved revision: 23
Merged at revision: 24
Proposed branch: lp:~sergiusens/ubuntu/wily/ubuntu-core-config/panic
Merge into: lp:ubuntu/wily/ubuntu-core-config
Diff against target: 25 lines (+11/-0)
2 files modified
debian/changelog (+6/-0)
etc/default/grub.d/50-system-image.cfg (+5/-0)
To merge this branch: bzr merge lp:~sergiusens/ubuntu/wily/ubuntu-core-config/panic
Reviewer Review Type Date Requested Status
Michael Vogt (community) Approve
Review via email: mp+261378@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Thanks! Great that you found this one!

review: Approve

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 2015-06-05 16:31:58 +0000
3+++ debian/changelog 2015-06-08 13:05:46 +0000
4@@ -1,3 +1,9 @@
5+ubuntu-core-config (0.6.19) UNRELEASED; urgency=medium
6+
7+ * Adding system image grub configuration (LP: #1462501)
8+
9+ -- Sergio Schvezov <sergio.schvezov@canonical.com> Mon, 08 Jun 2015 10:02:04 -0300
10+
11 ubuntu-core-config (0.6.18) wily; urgency=low
12
13 * revert 'use "transition" for /etc/apparmor.d/cache' change
14
15=== added directory 'etc/default'
16=== added directory 'etc/default/grub.d'
17=== added file 'etc/default/grub.d/50-system-image.cfg'
18--- etc/default/grub.d/50-system-image.cfg 1970-01-01 00:00:00 +0000
19+++ etc/default/grub.d/50-system-image.cfg 2015-06-08 13:05:46 +0000
20@@ -0,0 +1,5 @@
21+# console only, no graphics/vga
22+GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=ttyS0 panic=-1"
23+GRUB_TERMINAL=console
24+# LP: #1035279
25+GRUB_RECORDFAIL_TIMEOUT=0

Subscribers

People subscribed via source and target branches