← Back to team overview

cloud-init-dev team mailing list archive

[Merge] ~prometheanfire/cloud-init:update_rc-service into cloud-init:master

 

Matthew Thode has proposed merging ~prometheanfire/cloud-init:update_rc-service into cloud-init:master.

Requested reviews:
  cloud-init commiters (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~prometheanfire/cloud-init/+git/cloud-init/+merge/332754

Update init-script that's called for gentoo-openrc, the 'service' script is going away.

Also update perms on the gentoo openrc init scripts.
-- 
Your team cloud-init commiters is requested to review the proposed merge of ~prometheanfire/cloud-init:update_rc-service into cloud-init:master.
diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py
index 0ad2f03..dc57717 100644
--- a/cloudinit/distros/gentoo.py
+++ b/cloudinit/distros/gentoo.py
@@ -24,7 +24,7 @@ class Distro(distros.Distro):
     network_conf_fn = '/etc/conf.d/net'
     resolve_conf_fn = '/etc/resolv.conf'
     hostname_conf_fn = '/etc/conf.d/hostname'
-    init_cmd = ['service']  # init scripts
+    init_cmd = ['rc-service']  # init scripts
 
     def __init__(self, name, cfg, paths):
         distros.Distro.__init__(self, name, cfg, paths)
diff --git a/sysvinit/gentoo/cloud-config b/sysvinit/gentoo/cloud-config
old mode 100644
new mode 100755
index 5618472..5618472
--- a/sysvinit/gentoo/cloud-config
+++ b/sysvinit/gentoo/cloud-config
diff --git a/sysvinit/gentoo/cloud-final b/sysvinit/gentoo/cloud-final
old mode 100644
new mode 100755
index a9bf01f..a9bf01f
--- a/sysvinit/gentoo/cloud-final
+++ b/sysvinit/gentoo/cloud-final
diff --git a/sysvinit/gentoo/cloud-init b/sysvinit/gentoo/cloud-init
old mode 100644
new mode 100755
index 531a715..531a715
--- a/sysvinit/gentoo/cloud-init
+++ b/sysvinit/gentoo/cloud-init
diff --git a/sysvinit/gentoo/cloud-init-local b/sysvinit/gentoo/cloud-init-local
old mode 100644
new mode 100755
index 0f8cf65..0f8cf65
--- a/sysvinit/gentoo/cloud-init-local
+++ b/sysvinit/gentoo/cloud-init-local

Follow ups