chore: use default symlinks to /bin in base

Use default symlinks from `/toolchain/bin` to `/bin` in `base`. Signed-off-by: Noel Georgi <git@frezbo.dev>
siderolabs · Jan 4, 2023 · 8965bee · 8965bee
1 parent 325c9bf
commit 8965bee
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/base/pkg.yaml b/base/pkg.yaml
@@ -12,9 +12,8 @@ steps:
         cp -R /toolchain/lib/libz* /lib
 
         mkdir /bin
-        ln -sv /toolchain/bin/bash /bin/bash
+        find /toolchain/bin -type f -executable -printf "%f\n" | xargs -I {} ln -s /toolchain/bin/{} /bin/{}
         ln -sv /toolchain/bin/bash /bin/sh
-        ln -sv /toolchain/bin/pwd /bin/pwd
 
         adjust.sh
 finalize:

diff --git a/ipxe/pkg.yaml b/ipxe/pkg.yaml
@@ -15,7 +15,6 @@ steps:
       IPXE_VERSION: 1.21.1+git+{{ substr 0 7 .ipxe_ref }}+sidero
     prepare:
       - |
-        ln -s /toolchain/bin/echo /bin/echo
         tar -xzf ipxe.tar.gz --strip-components=1
 
         patch -p1 < /pkg/patches/https.patch