Merge branch 'current' into crux

Conflicts:
	scripts/live-build-config

2 files changed, 32 insertions, 0 deletions

diff --git a/tools/cloud-init/OCI/90_dpkg.cfg b/tools/cloud-init/OCI/90_dpkg.cfg
new file mode 100644
index 00000000..0575be1e
--- /dev/null
+++ b/tools/cloud-init/OCI/90_dpkg.cfg
@@ -0,0 +1,2 @@
+# to update this file, run dpkg-reconfigure cloud-init
+datasource_list: [ Oracle ]
diff --git a/tools/cloud-init/OCI/config.boot.default b/tools/cloud-init/OCI/config.boot.default
new file mode 100644
index 00000000..18f6ef09
--- /dev/null
+++ b/tools/cloud-init/OCI/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 {
+    }
+}