diff options
| author | Simon Rettberg | 2024-06-12 22:03:37 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2024-06-12 22:03:37 +0200 |
| commit | f7e42e1dd619bec798515cf4982d38f07e61c11d (patch) | |
| tree | 4e7a2feed074bab77a70bb36fae6217cb6627c81 | |
| parent | [config-tgz] Support multiple space separated local configs (diff) | |
| download | systemd-init-f7e42e1dd619bec798515cf4982d38f07e61c11d.tar.gz systemd-init-f7e42e1dd619bec798515cf4982d38f07e61c11d.tar.xz systemd-init-f7e42e1dd619bec798515cf4982d38f07e61c11d.zip | |
De-duplicate tools copied vs. what busybox ships
... and hope nothing breaks
| -rw-r--r-- | modules.d/busybox/openslx.config | 26 | ||||
| -rwxr-xr-x | modules.d/conf-tgz/module-setup.sh | 4 | ||||
| -rwxr-xr-x | modules.d/dnbd3-rootfs/module-setup.sh | 14 |
3 files changed, 22 insertions, 22 deletions
diff --git a/modules.d/busybox/openslx.config b/modules.d/busybox/openslx.config index 6a99cba4..1902c4d5 100644 --- a/modules.d/busybox/openslx.config +++ b/modules.d/busybox/openslx.config @@ -178,17 +178,17 @@ CONFIG_FEATURE_GZIP_DECOMPRESS=y # CONFIG_LZOP_COMPR_HIGH is not set # CONFIG_RPM is not set # CONFIG_RPM2CPIO is not set -CONFIG_TAR=y +# CONFIG_TAR is not set # CONFIG_FEATURE_TAR_LONG_OPTIONS is not set -CONFIG_FEATURE_TAR_CREATE=y -CONFIG_FEATURE_TAR_AUTODETECT=y -CONFIG_FEATURE_TAR_FROM=y +# CONFIG_FEATURE_TAR_CREATE is not set +# CONFIG_FEATURE_TAR_AUTODETECT is not set +# CONFIG_FEATURE_TAR_FROM is not set # CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set # CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +# CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set # CONFIG_FEATURE_TAR_TO_COMMAND is not set # CONFIG_FEATURE_TAR_UNAME_GNAME is not set -CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y +# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set # CONFIG_FEATURE_TAR_SELINUX is not set # CONFIG_UNZIP is not set # CONFIG_FEATURE_UNZIP_CDF is not set @@ -669,17 +669,17 @@ CONFIG_MKFS_VFAT=y CONFIG_MKSWAP=y # CONFIG_FEATURE_MKSWAP_UUID is not set CONFIG_MORE=y -CONFIG_MOUNT=y +# CONFIG_MOUNT is not set # CONFIG_FEATURE_MOUNT_FAKE is not set -CONFIG_FEATURE_MOUNT_VERBOSE=y -CONFIG_FEATURE_MOUNT_HELPERS=y +# CONFIG_FEATURE_MOUNT_VERBOSE is not set +# CONFIG_FEATURE_MOUNT_HELPERS is not set # CONFIG_FEATURE_MOUNT_LABEL is not set # CONFIG_FEATURE_MOUNT_NFS is not set -CONFIG_FEATURE_MOUNT_CIFS=y -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y +# CONFIG_FEATURE_MOUNT_CIFS is not set +# CONFIG_FEATURE_MOUNT_FLAGS is not set +# CONFIG_FEATURE_MOUNT_FSTAB is not set # CONFIG_FEATURE_MOUNT_OTHERTAB is not set -# CONFIG_MOUNTPOINT is not set +CONFIG_MOUNTPOINT=y # CONFIG_NOLOGIN is not set # CONFIG_NOLOGIN_DEPENDENCIES is not set # CONFIG_NSENTER is not set diff --git a/modules.d/conf-tgz/module-setup.sh b/modules.d/conf-tgz/module-setup.sh index cf2ba088..bfcb7d91 100755 --- a/modules.d/conf-tgz/module-setup.sh +++ b/modules.d/conf-tgz/module-setup.sh @@ -7,7 +7,9 @@ depends() { echo dnbd3-rootfs slx-tools } install() { - inst_multiple tar mktemp gzip + # gzip and mktemp provided by busybox + # tar is needed for some more advanced args + inst_multiple tar slx_service "s3-fetch-config" "Download text-based config" \ --wafter "s3-setup-bootif-network.service" \ diff --git a/modules.d/dnbd3-rootfs/module-setup.sh b/modules.d/dnbd3-rootfs/module-setup.sh index bff931f7..0e84699f 100755 --- a/modules.d/dnbd3-rootfs/module-setup.sh +++ b/modules.d/dnbd3-rootfs/module-setup.sh @@ -180,16 +180,14 @@ install() { inst "$moddir/configuration/bash" '/etc/profile.d/aliases' fi # endregion + # check if busybox can offer a desired tool (and desired features) + # before adding anything here. inst_multiple \ - awk \ - basename bash blockdev \ - cat cut curl \ - dd diff dirname dmsetup \ - find \ + bash \ + curl \ + dmsetup \ grep \ insmod \ lsblk \ - mkfifo mktemp mount mountpoint \ - sed sleep sort \ - tee touch tr + mount } |