diff options
| author | Scott Moser <smoser@brickies.net> | 2016-10-03 12:20:45 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-10-03 12:36:20 -0400 |
| commit | e81fdb7319c88e3cfce654bc37acb231e7259042 (patch) | |
| tree | f76897424d068c5450cc656f9e2fc0821ab31f23 | |
| parent | e27555769d9e432f1a5b3dfbd91a6fea51ddf435 (diff) | |
| download | vyos-cloud-init-e81fdb7319c88e3cfce654bc37acb231e7259042.tar.gz vyos-cloud-init-e81fdb7319c88e3cfce654bc37acb231e7259042.zip | |
cherry pick 6d1edc3f5a1
add 6d1edc3f5a1 to
debian/patches/ntp-move-to-run-after-apt-configuration.patch
LP: #1628337
| -rw-r--r-- | debian/patches/ntp-move-to-run-after-apt-configuration.patch | 30 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/debian/patches/ntp-move-to-run-after-apt-configuration.patch b/debian/patches/ntp-move-to-run-after-apt-configuration.patch new file mode 100644 index 00000000..e25bc014 --- /dev/null +++ b/debian/patches/ntp-move-to-run-after-apt-configuration.patch @@ -0,0 +1,30 @@ +From 6d1edc3f5a18b328bdd307426056539d5b9071fd Mon Sep 17 00:00:00 2001 +From: Scott Moser <smoser@brickies.net> +Date: Wed, 28 Sep 2016 12:07:26 -0400 +Subject: [PATCH] ntp: move to run after apt configuration + +since ntp module may try to install packages, it needs to run after +apt is configured. + +LP: #1628337 +--- + config/cloud.cfg | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/config/cloud.cfg ++++ b/config/cloud.cfg +@@ -45,13 +45,13 @@ cloud_config_modules: + - emit_upstart + - disk_setup + - mounts +- - ntp + - ssh-import-id + - locale + - set-passwords + - grub-dpkg + - apt-pipelining + - apt-configure ++ - ntp + - timezone + - disable-ec2-metadata + - runcmd diff --git a/debian/patches/series b/debian/patches/series index c486f303..c93c18ac 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ ipv6-config +ntp-move-to-run-after-apt-configuration.patch |