Merge branch 'current' into crux

Conflicts:
	data/live-build-config/package-lists/vyos-utils.list.chroot
	scripts/live-build-config

8 files changed, 115 insertions, 0 deletions

diff --git a/tools/cloud-init/AWS/90_dpkg.cfg b/tools/cloud-init/AWS/90_dpkg.cfg
new file mode 100644
index 00000000..1bf7d288
--- /dev/null
+++ b/tools/cloud-init/AWS/90_dpkg.cfg
@@ -0,0 +1,2 @@
+# to update this file, run dpkg-reconfigure cloud-init
+datasource_list: [ Ec2 ]
diff --git a/tools/cloud-init/AWS/config.boot.default b/tools/cloud-init/AWS/config.boot.default
new file mode 100644
index 00000000..18f6ef09
--- /dev/null
+++ b/tools/cloud-init/AWS/config.boot.default
@@ -0,0 +1,30 @@
+system {
+    syslog {
+        global {
+            facility all {
+                level info
+            }
+            facility protocols {
+                level debug
+            }
+        }
+    }
+    ntp {
+        server "0.pool.ntp.org"
+        server "1.pool.ntp.org"
+        server "2.pool.ntp.org"
+    }
+    console {
+        device ttyS0 {
+            speed 9600
+        }
+    }
+    config-management {
+        commit-revisions 100
+    }
+}
+
+interfaces {
+    loopback lo {
+    }
+}
diff --git a/tools/cloud-init/GCE/90_dpkg.cfg b/tools/cloud-init/GCE/90_dpkg.cfg
new file mode 100644
index 00000000..ac4ffeae
--- /dev/null
+++ b/tools/cloud-init/GCE/90_dpkg.cfg
@@ -0,0 +1,2 @@
+# to update this file, run dpkg-reconfigure cloud-init
+datasource_list: [ GCE ]
diff --git a/tools/cloud-init/GCE/config.boot.default b/tools/cloud-init/GCE/config.boot.default
new file mode 100644
index 00000000..a0cc398f
--- /dev/null
+++ b/tools/cloud-init/GCE/config.boot.default
@@ -0,0 +1,30 @@
+system {
+    syslog {
+        global {
+            facility all {
+                level info
+            }
+            facility protocols {
+                level debug
+            }
+        }
+    }
+    ntp {
+        server "0.pool.ntp.org"
+        server "1.pool.ntp.org"
+        server "2.pool.ntp.org"
+    }
+    console {
+        device ttyS0 {
+            speed 38400
+        }
+    }
+    config-management {
+        commit-revisions 100
+    }
+}
+
+interfaces {
+    loopback lo {
+    }
+}
diff --git a/tools/cloud-init/azure/99-walinuxagent.chroot b/tools/cloud-init/azure/99-walinuxagent.chroot
new file mode 100755
index 00000000..1de525cf
--- /dev/null
+++ b/tools/cloud-init/azure/99-walinuxagent.chroot
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+echo I: Waagent / Cloud init
+
+# debug info:
+#echo ForwardToConsole=yes >> /etc/systemd/journald.conf
+
+# dhcp issue on azure
+sed -ie 's,rfc3442-classless-static-routes,disabled-\0,' /etc/dhcp/dhclient.conf
+
+rm -f /etc/ssh/ssh_host_*
+rm -f /var/log/waagent.log
+rm -r /var/cache/apt/*
+mkdir -p /var/cache/apt/archives
+rm -r /var/lib/apt/lists/*
+
+# prevent systemd message flooding
+echo ':msg, contains, "Time has been changed" ~' > /etc/rsyslog.d/time_msgs.conf
diff --git a/tools/cloud-init/azure/config.boot.default b/tools/cloud-init/azure/config.boot.default
new file mode 100644
index 00000000..296c690a
--- /dev/null
+++ b/tools/cloud-init/azure/config.boot.default
@@ -0,0 +1,30 @@
+system {
+    syslog {
+        global {
+            facility all {
+                level info
+            }
+            facility protocols {
+                level debug
+            }
+        }
+    }
+    ntp {
+        server "0.pool.ntp.org"
+        server "1.pool.ntp.org"
+        server "2.pool.ntp.org"
+    }
+    console {
+        device ttyS0 {
+            speed 115200
+        }
+    }
+    config-management {
+        commit-revisions 100
+    }
+}
+
+interfaces {
+    loopback lo {
+    }
+}
diff --git a/tools/cloud-init/azure/vyos-azure.list.chroot b/tools/cloud-init/azure/vyos-azure.list.chroot
new file mode 100644
index 00000000..91320a59
--- /dev/null
+++ b/tools/cloud-init/azure/vyos-azure.list.chroot
@@ -0,0 +1,2 @@
+cloud-init
+walinuxagent
diff --git a/tools/cloud-init/cloud-init.list.chroot b/tools/cloud-init/cloud-init.list.chroot
new file mode 100644
index 00000000..db064e62
--- /dev/null
+++ b/tools/cloud-init/cloud-init.list.chroot
@@ -0,0 +1 @@
+cloud-init