From 290c87d9aed37502226f92e803a5162027640f87c8dd1f2ffd01f25e9be1e1d9 Mon Sep 17 00:00:00 2001
From: Thorsten Kukuk <kukuk@suse.com>
Date: Fri, 10 May 2019 08:20:30 +0000
Subject: [PATCH] Accepting request 701939 from home:kukuk:container

- Lock root password

OBS-URL: https://build.opensuse.org/request/show/701939
OBS-URL: https://build.opensuse.org/package/show/devel:kubic:containers/tumbleweed-busybox-image?expand=0&rev=3
---
 _service                         | 2 +-
 config.sh                        | 1 +
 tumbleweed-busybox-image.changes | 5 +++++
 tumbleweed-busybox-image.kiwi    | 6 +++---
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/_service b/_service
index d1bc575..dc6f281 100644
--- a/_service
+++ b/_service
@@ -2,7 +2,7 @@
     <service mode="buildtime" name="kiwi_metainfo_helper"/>
     <service name="replace_using_package_version" mode="buildtime">
         <param name="file">tumbleweed-busybox-image.kiwi</param>
-        <param name="regex">%%LONG_VERSION%%</param>
+        <param name="regex">%PKG_VERSION%</param>
         <param name="parse-version">patch</param>
         <param name="package">busybox</param>
     </service>
diff --git a/config.sh b/config.sh
index 8616022..b579592 100644
--- a/config.sh
+++ b/config.sh
@@ -26,5 +26,6 @@ echo "Configure image: [$kiwi_iname]..."
 /bin/rm /usr/bin/busybox
 /bin/rm /usr/bin/busybox.install
 /bin/rm -rf /usr/share/busybox
+/bin/sed -i -e 's|root::|root:!:|g' /etc/shadow
 
 exit 0
diff --git a/tumbleweed-busybox-image.changes b/tumbleweed-busybox-image.changes
index edad7b3..4eec29a 100644
--- a/tumbleweed-busybox-image.changes
+++ b/tumbleweed-busybox-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu May  9 20:07:19 CEST 2019 - kukuk@suse.de
+
+- Lock root password
+
 -------------------------------------------------------------------
 Wed Apr 10 10:37:18 CEST 2019 - kukuk@suse.de
 
diff --git a/tumbleweed-busybox-image.kiwi b/tumbleweed-busybox-image.kiwi
index 19ce0ca..04e43ae 100644
--- a/tumbleweed-busybox-image.kiwi
+++ b/tumbleweed-busybox-image.kiwi
@@ -10,17 +10,17 @@
       <containerconfig
 	name="tumbleweed/busybox"
         tag="latest"
-	additionaltags="%%LONG_VERSION%%,%%LONG_VERSION%%-%RELEASE%"
+	additionaltags="%PKG_VERSION%,%PKG_VERSION%-%RELEASE%"
         maintainer="Thorsten Kukuk &lt;kukuk@suse.com&gt;">
         <labels>
           <suse_label_helper:add_prefix prefix="org.opensuse.tumbleweed.busybox">
             <label name="org.opencontainers.title" value="openSUSE Tumbleweed Busybox Container"/>
             <label name="org.opencontainers.description" value="Small image containing busybox."/>
-            <label name="org.opencontainers.version" value="%%LONG_VERSION%%-%RELEASE%"/>
+            <label name="org.opencontainers.version" value="%PKG_VERSION%-%RELEASE%"/>
             <label name="org.opencontainers.created" value="%BUILDTIME%"/>
             <label name="org.opencontainers.image.vendor" value="openSUSE Project"/>
             <label name="org.opencontainers.image.url" value="https://www.opensuse.org/"/>
-            <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/tumbleweed/busybox:%%LONG_VERSION%%-%RELEASE%"/>
+            <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/tumbleweed/busybox:%PKG_VERSION%-%RELEASE%"/>
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
           </suse_label_helper:add_prefix>
         </labels>