autoinst

commit 50664dd785a7bb9b34b13aa196e60be14a45cec6
parent 77864001ae47410a103246e73a2029012f47372c
Author: Morel Bérenger <berenger.morel@neutralite.org>
Date:   Tue, 25 Feb 2020 16:38:39 +0100

moved busybox management outside of mkiso.sh

Diffstat:
A
busybox.sh
 | 
18
++++++++++++++++++
M
mkiso.sh
 | 
14
+-------------

2 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/busybox.sh b/busybox.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# installs but don't enable runscripts for bb's applets
+cp -ar etc/busybox $1
+
+# install busybox applets as /usr/local/bin symlinks
+for link in $(LANG=C busybox --help | awk 'BEGIN{list=0}/Currently defined functions:/{list=1}/^\t/{if( list == 1 ) print}' | tr ',' '\n')
+do
+	test -n "$link" && ln -s /bin/busybox iso_dir/usr/local/bin/$link
+done
+
+# but since /usr/local/bin have higher priority than /usr/bin even for at least
+# some rc.d scripts, remove some...
+# TODO: I think this is actually a bug, should report it.
+for exclude in run-parts
+do
+	rm iso_dir/usr/local/bin/$exclude
+done
diff --git a/mkiso.sh b/mkiso.sh
@@ -37,19 +37,7 @@ EOF
 
 rm -r iso_dir/var/cache/apt/* iso_dir/var/log/*
 
-# install busybox applets as /usr/local/bin symlinks
-for link in $(LANG=C busybox --help | awk 'BEGIN{list=0}/Currently defined functions:/{list=1}/^\t/{if( list == 1 ) print}' | tr ',' '\n')
-do
-	test -n "$link" && ln -s /bin/busybox iso_dir/usr/local/bin/$link
-done
-
-# but since /usr/local/bin have higher priority than /usr/bin even for at least
-# some rc.d scripts, remove some...
-# TODO: I think this is actually a bug, should report it.
-for exclude in run-parts
-do
-	rm iso_dir/usr/local/bin/$exclude
-done
+./busybox.sh iso_dir
 
 xorriso -as mkisofs \
 	-r -V 'CUSTOM_ISO_AMD64' \