Replace cdebootstrap-static with its dynamic variant.

Primary argument to do this, is that updates to components from which
cdebootstrap-static is build, needed a manual trigger to be picked up.
By switching to the dynamic variant, that is no longer needed.
We also already had most of the dependencies of the dynamic one already
included in the project.

Signed-off-by: Diederik de Haas <[email protected]>

build.sh

@@ -196,9 +196,9 @@ function create_cpio {
     ln -s ../../../etc/ssl/certs certs 
     cd ../../../..
 
-    # cdebootstrap-static components
-    cp -r tmp/usr/share/cdebootstrap-static rootfs/usr/share/
-    cp tmp/usr/bin/cdebootstrap-static rootfs/usr/bin/
+    # cdebootstrap components
+    cp -r tmp/usr/share/cdebootstrap rootfs/usr/share/
+    cp tmp/usr/bin/cdebootstrap rootfs/usr/bin/
 
     # curl components
     cp tmp/usr/bin/curl rootfs/usr/bin/

scripts/etc/init.d/rcS

@@ -12,6 +12,8 @@
 
 LOGFILE=/tmp/raspbian-ua-netinst.log
 
+CDEBOOTSTRAP_BIN=cdebootstrap
+
 # default options, can be overriden in installer-config.txt
 preset=server
 packages=
@@ -1112,7 +1114,7 @@ log_msg "Starting install process..."
 # With 'cdebootstrap_cmdline we're actually using the word splitting what SC2086 warns us against
 # This should probably be fixed at some point, but not in this run/branch.
 # shellcheck disable=SC2086
-cdebootstrap-static --arch=armhf $cdebootstrap_cmdline "$release" /rootfs $mirror --keyring=/usr/share/keyrings/raspbian-archive-keyring.gpg || fail
+$CDEBOOTSTRAP_BIN --arch=armhf $cdebootstrap_cmdline "$release" /rootfs $mirror --keyring=/usr/share/keyrings/raspbian-archive-keyring.gpg || fail
 
 log_msg "Configuring installed system:"
 

update.sh

@@ -28,7 +28,7 @@ packages+=("firmware-brcm80211")
 packages+=("btrfs-progs")
 packages+=("busybox")
 packages+=("ca-certificates-udeb")
-packages+=("cdebootstrap-static")
+packages+=("cdebootstrap")
 packages+=("curl")
 packages+=("distro-info-data")
 packages+=("dosfstools")