Charm Helpers

Merge lp:~timkuhlman/charm-helpers/modules-newline into lp:charm-helpers

  1. modules-newline
  2. Merge into devel
Proposed by Tim Kuhlman
Status: Merged
Merged at revision: 660
Proposed branch: lp:~timkuhlman/charm-helpers/modules-newline
Merge into: lp:charm-helpers
Diff against target: 12 lines (+1/-1)
1 file modified
charmhelpers/core/kernel_factory/ubuntu.py (+1/-1)
To merge this branch: bzr merge lp:~timkuhlman/charm-helpers/modules-newline
Reviewer Review Type Date Requested Status
Stuart Bishop (community) Approve
Review via email: mp+311637@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Stuart Bishop (stub) wrote :

Looks good

review: Approve
Revision history for this message
Stuart Bishop (stub) wrote :

Landed, fixing the broken test on the way.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/core/kernel_factory/ubuntu.py'
2--- charmhelpers/core/kernel_factory/ubuntu.py 2016-08-11 15:47:44 +0000
3+++ charmhelpers/core/kernel_factory/ubuntu.py 2016-11-23 16:39:25 +0000
4@@ -5,7 +5,7 @@
5 """Load a kernel module and configure for auto-load on reboot."""
6 with open('/etc/modules', 'r+') as modules:
7 if module not in modules.read():
8- modules.write(module)
9+ modules.write(module + "\n")
10
11
12 def update_initramfs(version='all'):

Subscribers

People subscribed via source and target branches