Merge ~prometheanfire/cloud-init:fix-gentoo-init into cloud-init:master

Proposed by Matthew Thode
Status: Merged
Merged at revision: e772f52bf77ef8e01db934167a974ca31b7cd61f
Proposed branch: ~prometheanfire/cloud-init:fix-gentoo-init
Merge into: cloud-init:master
Diff against target: 25 lines (+2/-1)
2 files modified
sysvinit/gentoo/cloud-init (+1/-0)
sysvinit/gentoo/cloud-init-local (+1/-1)
Reviewer Review Type Date Requested Status
cloud-init Commiters Pending
Review via email: mp+307969@code.launchpad.net

Description of the change

    update Gentoo initscripts to run in the correct order

    cloud-init-local needs to be run before net (and in the boot runlevel)
    as it sets up networking config and adds it to the default runlevel.

    cloud-init-local needs to be run in the boot runlevel because it
    modifies services in the default runlevel. When a runlevel is started
    it is cached, so modifications that happen to the current runlevel while
    you are in it are not acted upon.

    cloud-init needs to run after net, it does not need net because we still
    want it to set up other things if it can.

To post a comment you must log in.
Revision history for this message
Matthew Thode (prometheanfire) wrote :

If it helps I've verified this works on images I built with the https://review.openstack.org/#/c/383811/ patchset

Revision history for this message
Matthew Thode (prometheanfire) wrote :

is this missing anything?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/sysvinit/gentoo/cloud-init b/sysvinit/gentoo/cloud-init
2index 5afc0f2..531a715 100644
3--- a/sysvinit/gentoo/cloud-init
4+++ b/sysvinit/gentoo/cloud-init
5@@ -2,6 +2,7 @@
6 # add depends for network, dns, fs etc
7 depend() {
8 after cloud-init-local
9+ after net
10 before cloud-config
11 provide cloud-init
12 }
13diff --git a/sysvinit/gentoo/cloud-init-local b/sysvinit/gentoo/cloud-init-local
14index 9bd0b56..0f8cf65 100644
15--- a/sysvinit/gentoo/cloud-init-local
16+++ b/sysvinit/gentoo/cloud-init-local
17@@ -2,7 +2,7 @@
18
19 depend() {
20 after localmount
21- after netmount
22+ before net
23 before cloud-init
24 provide cloud-init-local
25 }

Subscribers

People subscribed via source and target branches