|
 |
8f0b40 |
From c533a99fd7e3f78027c74a889e931604c222db0f Mon Sep 17 00:00:00 2001
|
|
|
8f0b40 |
From: Eduardo Otubo <otubo@redhat.com>
|
|
|
8f0b40 |
Date: Wed, 26 Sep 2018 13:57:39 +0200
|
|
|
8f0b40 |
Subject: [PATCH 1/4] Adding systemd mount options to wait for cloud-init
|
|
|
8f0b40 |
|
|
|
8f0b40 |
RH-Author: Eduardo Otubo <otubo@redhat.com>
|
|
|
8f0b40 |
Message-id: <20180926135742.11140-2-otubo@redhat.com>
|
|
|
8f0b40 |
Patchwork-id: 82297
|
|
|
8f0b40 |
O-Subject: [RHEL-7.6 cloud-init PATCHv2 1/4] Adding systemd mount options to wait for cloud-init
|
|
|
8f0b40 |
Bugzilla: 1560415
|
|
|
8f0b40 |
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
|
8f0b40 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
8f0b40 |
|
|
|
8f0b40 |
This patch adds systemd mount options to wait for cloud-init. On Azure,
|
|
|
8f0b40 |
cloud-init needs to format ephemeral disk before we are able to mount
|
|
|
8f0b40 |
it.
|
|
|
8f0b40 |
|
|
|
8f0b40 |
X-downstream-only: yes
|
|
|
8f0b40 |
Resolves: rhbz#1560415
|
|
|
8f0b40 |
|
|
|
8f0b40 |
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
|
|
8f0b40 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
8f0b40 |
---
|
|
|
8f0b40 |
rhel/cloud.cfg | 2 +-
|
|
|
8f0b40 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
8f0b40 |
|
|
|
8f0b40 |
diff --git a/rhel/cloud.cfg b/rhel/cloud.cfg
|
|
|
8f0b40 |
index 8644872..bb6bc4d 100644
|
|
|
8f0b40 |
--- a/rhel/cloud.cfg
|
|
|
8f0b40 |
+++ b/rhel/cloud.cfg
|
|
|
8f0b40 |
@@ -4,7 +4,7 @@ users:
|
|
|
8f0b40 |
disable_root: 1
|
|
|
8f0b40 |
ssh_pwauth: 0
|
|
|
8f0b40 |
|
|
|
8f0b40 |
-mount_default_fields: [~, ~, 'auto', 'defaults,nofail', '0', '2']
|
|
|
8f0b40 |
+mount_default_fields: [~, ~, 'auto', 'defaults,nofail,x-systemd.requires=cloud-init.service', '0', '2']
|
|
|
8f0b40 |
resize_rootfs_tmp: /dev
|
|
|
8f0b40 |
ssh_deletekeys: 0
|
|
|
8f0b40 |
ssh_genkeytypes: ~
|
|
|
8f0b40 |
--
|
|
|
8f0b40 |
1.8.3.1
|
|
|
8f0b40 |
|