From 9a2b86eaa661e61b206238c8626faec08d4f20d17500b3f71f1098ded8735759 Mon Sep 17 00:00:00 2001
From: Thorsten Kukuk <kukuk@suse.com>
Date: Mon, 9 Sep 2019 11:06:42 +0000
Subject: [PATCH] Accepting request 729402 from home:kukuk:container

- Use busybox-container, much smaller

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

diff --git a/_service b/_service
index dc6f281..8f1d6d9 100644
--- a/_service
+++ b/_service
@@ -4,7 +4,7 @@
         <param name="file">tumbleweed-busybox-image.kiwi</param>
         <param name="regex">%PKG_VERSION%</param>
         <param name="parse-version">patch</param>
-        <param name="package">busybox</param>
+        <param name="package">busybox-container</param>
     </service>
     <service mode="buildtime" name="kiwi_label_helper"/>
 </services>
diff --git a/config.sh b/config.sh
index 8616022..c818a0c 100644
--- a/config.sh
+++ b/config.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/busybox sh
+#!/usr/bin/busybox-container sh
   
 #======================================
 # Functions...
@@ -12,6 +12,7 @@ test -f /.profile && . /.profile
 #--------------------------------------
 echo "Configure image: [$kiwi_iname]..."
 
+/usr/bin/busybox-container ln -sf busybox-container /usr/bin/busybox
 /usr/bin/busybox ln -sf ../usr/bin/busybox /bin/ln
 /usr/bin/busybox ln -sf ../usr/bin/busybox /bin/rm
 /usr/bin/busybox ln -sf ../usr/bin/busybox /bin/mkdir
@@ -21,10 +22,11 @@ echo "Configure image: [$kiwi_iname]..."
 /usr/bin/busybox ln -sf busybox /usr/bin/install
 /usr/bin/busybox ln -sf busybox /usr/bin/dirname
 /usr/bin/busybox ln -sf busybox /usr/bin/basename
-/usr/bin/busybox.install / --symlinks
+/usr/bin/busybox-container.install / --symlinks
 /bin/rm linuxrc
 /bin/rm /usr/bin/busybox
-/bin/rm /usr/bin/busybox.install
+/bin/rm /usr/bin/busybox-container
+/bin/rm /usr/bin/busybox-container.install
 /bin/rm -rf /usr/share/busybox
 
 exit 0
diff --git a/tumbleweed-busybox-image.changes b/tumbleweed-busybox-image.changes
index 7280fdb..a573e4e 100644
--- a/tumbleweed-busybox-image.changes
+++ b/tumbleweed-busybox-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug 22 14:29:49 CEST 2019 - kukuk@suse.de
+
+- Use busybox-container, much smaller
+
 -------------------------------------------------------------------
 Fri Aug  2 12:54:52 UTC 2019 - Thorsten Kukuk <kukuk@suse.com>
 
diff --git a/tumbleweed-busybox-image.kiwi b/tumbleweed-busybox-image.kiwi
index f74542c..7aa57ad 100644
--- a/tumbleweed-busybox-image.kiwi
+++ b/tumbleweed-busybox-image.kiwi
@@ -37,6 +37,6 @@
     <source path="obsrepositories:/"/>
   </repository>
   <packages type="bootstrap">
-    <package name="busybox"/>
+    <package name="busybox-container"/>
   </packages>
 </image>