Merge remote-tracking branch 'origin/current' into equuleus

fixed merge errors in:
    * scripts/live-build-config
      - kernel parameters

    * scripts/build-packages
      - fixed list of packages to compile

1 files changed, 40 insertions, 0 deletions

diff --git a/tools/cloud-init/openstack/config.boot.default b/tools/cloud-init/openstack/config.boot.default
new file mode 100644
index 00000000..de724f0b
--- /dev/null
+++ b/tools/cloud-init/openstack/config.boot.default
@@ -0,0 +1,40 @@
+system {
+    host-name vyos
+    login {
+        user vyos {
+            authentication {
+                encrypted-password "*"
+                plaintext-password ""
+            }
+            level admin
+        }
+    }
+    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 {
+    }
+}