cloud-init

Merge ~ckonstanski/cloud-init:issue-1727121 into cloud-init:master

  1. Git
  2. lp:~ckonstanski/cloud-init
  3. issue-1727121
  4. Merge into master
Proposed by Carlos Konstanski on 2017-10-25
Status: Merged
Approved by: Scott Moser on 2017-10-26
Approved revision: f8534104f24c16c95c5477183a9b1a8f2cef2bf2
Merged at revision: a90a8b1cb3104ee3250ac79d6e25a9ff4f527baa
Proposed branch: ~ckonstanski/cloud-init:issue-1727121
Merge into: cloud-init:master
Diff against target: 13 lines (+1/-1)
1 file modified
cloudinit/distros/gentoo.py (+1/-1)
Reviewer Review Type Date Requested Status
Scott Moser 2017-10-25 Approve on 2017-10-26
Review via email: mp+332756@code.launchpad.net

Commit Message

Gentoo: Use 'rc-service' rather than 'service'.

The 'service' command will be disappearing soon from Gentoo's openrc package. The 'rc-service' command is preferred.

LP: #1727121

To post a comment you must log in.
Scott Moser (smoser) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py
2index 0ad2f03..dc57717 100644
3--- a/cloudinit/distros/gentoo.py
4+++ b/cloudinit/distros/gentoo.py
5@@ -24,7 +24,7 @@ class Distro(distros.Distro):
6 network_conf_fn = '/etc/conf.d/net'
7 resolve_conf_fn = '/etc/resolv.conf'
8 hostname_conf_fn = '/etc/conf.d/hostname'
9- init_cmd = ['service'] # init scripts
10+ init_cmd = ['rc-service'] # init scripts
11
12 def __init__(self, name, cfg, paths):
13 distros.Distro.__init__(self, name, cfg, paths)

Subscribers

People subscribed via source and target branches