Commit 84873138 authored by Thomas Goirand's avatar Thomas Goirand

Fix diff with upstream.

parent ca8c3e8d
...@@ -1212,7 +1212,7 @@ def find_devs_with(criteria=None, oformat='device', ...@@ -1212,7 +1212,7 @@ def find_devs_with(criteria=None, oformat='device',
LABEL=<label> LABEL=<label>
UUID=<uuid> UUID=<uuid>
""" """
blk_id_cmd = ['/sbin/blkid'] blk_id_cmd = ['blkid']
options = [] options = []
if criteria: if criteria:
# Search for block devices with tokens named NAME that # Search for block devices with tokens named NAME that
......
Description: Fix sysv-init dependencies.
Forwarded: no
Last-Update: 2018-09-17
--- cloud-init-18.3.orig/sysvinit/debian/cloud-config
+++ cloud-init-18.3/sysvinit/debian/cloud-config
@@ -1,8 +1,8 @@
#! /bin/sh
### BEGIN INIT INFO
# Provides: cloud-config
-# Required-Start: cloud-init cloud-init-local
-# Required-Stop:
+# Required-Start: $local_fs $remote_fs cloud-init cloud-init-local
+# Required-Stop: $remote_fs
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Cloud init modules --mode config
--- cloud-init-18.3.orig/sysvinit/debian/cloud-final
+++ cloud-init-18.3/sysvinit/debian/cloud-final
@@ -2,7 +2,7 @@
### BEGIN INIT INFO
# Provides: cloud-final
# Required-Start: $all cloud-config
-# Required-Stop:
+# Required-Stop: $remote_fs
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Cloud init modules final jobs
--- cloud-init-18.3.orig/sysvinit/debian/cloud-init-local
+++ cloud-init-18.3/sysvinit/debian/cloud-init-local
@@ -2,7 +2,7 @@
### BEGIN INIT INFO
# Provides: cloud-init-local
# Required-Start: $local_fs $remote_fs
-# Required-Stop:
+# Required-Stop: $local_fs $remote_fs
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Cloud init local
...@@ -4,3 +4,4 @@ ...@@ -4,3 +4,4 @@
0007-Skip-Cloudstack-tests-that-expect-network.patch 0007-Skip-Cloudstack-tests-that-expect-network.patch
0009-Drop-all-unused-extended-version-handling.patch 0009-Drop-all-unused-extended-version-handling.patch
0012-Fix-message-when-a-local-is-missing.patch 0012-Fix-message-when-a-local-is-missing.patch
fix-sysvinit-dependencies.patch
#! /bin/sh #! /bin/sh
### BEGIN INIT INFO ### BEGIN INIT INFO
# Provides: cloud-config # Provides: cloud-config
# Required-Start: $local_fs $remote_fs cloud-init cloud-init-local # Required-Start: cloud-init cloud-init-local
# Required-Stop: $remote_fs # Required-Stop:
# Default-Start: 2 3 4 5 # Default-Start: 2 3 4 5
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
# Short-Description: Cloud init modules --mode config # Short-Description: Cloud init modules --mode config
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
### BEGIN INIT INFO ### BEGIN INIT INFO
# Provides: cloud-final # Provides: cloud-final
# Required-Start: $all cloud-config # Required-Start: $all cloud-config
# Required-Stop: $remote_fs # Required-Stop:
# Default-Start: 2 3 4 5 # Default-Start: 2 3 4 5
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
# Short-Description: Cloud init modules final jobs # Short-Description: Cloud init modules final jobs
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
### BEGIN INIT INFO ### BEGIN INIT INFO
# Provides: cloud-init-local # Provides: cloud-init-local
# Required-Start: $local_fs $remote_fs # Required-Start: $local_fs $remote_fs
# Required-Stop: $local_fs $remote_fs # Required-Stop:
# Default-Start: 2 3 4 5 # Default-Start: 2 3 4 5
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
# Short-Description: Cloud init local # Short-Description: Cloud init local
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment