From a225f5b9bdcc6ed9a914ee2203cb956517825268 Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Wed, 8 Jun 2016 11:37:33 -0700
Subject: [PATCH] Issue and manifest changes.

---
 builds/any/rootfs/jessie/standard/standard.yml | 16 +++++++++++++---
 builds/any/rootfs/wheezy/standard/standard.yml |  5 +++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/builds/any/rootfs/jessie/standard/standard.yml b/builds/any/rootfs/jessie/standard/standard.yml
index ff1e4208..44ff5a87 100644
--- a/builds/any/rootfs/jessie/standard/standard.yml
+++ b/builds/any/rootfs/jessie/standard/standard.yml
@@ -7,6 +7,9 @@
 #
 #
 ############################################################
+variables:
+  !include $ONL/make/versions/version-onl.yml
+
 Packages: &Packages
   - !include $ONL/builds/any/rootfs/$ONL_DEBIAN_SUITE/common/all-base-packages.yml
   - !include $ONL/builds/any/rootfs/$ONL_DEBIAN_SUITE/common/${ARCH}-base-packages.yml
@@ -89,6 +92,13 @@ Configure:
     root:
       password: onl
 
-  manifest:
-    version: $ONL/make/versions/version-onl.json
-    platforms: $PLATFORM_LIST
+  manifests:
+    '/etc/onl/rootfs/manifest.json' :
+      version : $ONL/make/versions/version-onl.json
+      platforms : $PLATFORM_LIST
+
+  issue: $VERSION_STRING
+
+  files:
+    remove:
+      - /etc/motd
diff --git a/builds/any/rootfs/wheezy/standard/standard.yml b/builds/any/rootfs/wheezy/standard/standard.yml
index 6bd5fbbf..3f046beb 100644
--- a/builds/any/rootfs/wheezy/standard/standard.yml
+++ b/builds/any/rootfs/wheezy/standard/standard.yml
@@ -100,3 +100,8 @@ Configure:
       platforms : $PLATFORM_LIST
 
   issue: $VERSION_STRING
+
+  files:
+    remove:
+      - /etc/motd
+