Skip to content

Commit

Permalink
Remove unnecessary and invalid e2scrub removal from post-build (#3886)
Browse files Browse the repository at this point in the history
Removal of the e2scrub binary is not needed anymore, as it's not installed and
only BR2_PACKAGE_E2FSPROGS_E2IMAGE is enabled. Moreover, it's been probably
wrong since the very beginning, as the TARGET_DIR prefix was missing, possibly
leading to removal of the binary from the host/builder.
  • Loading branch information
sairon authored Feb 20, 2025
1 parent e455669 commit 4ab51e7
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions buildroot-external/scripts/rootfs-layer.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/bin/bash

function fix_rootfs() {

# Cleanup etc
rm -rf "${TARGET_DIR:?}/etc/init.d"
rm -rf "${TARGET_DIR:?}/etc/network"
Expand All @@ -27,10 +26,6 @@ function fix_rootfs() {

# Use systemd-resolved for Host OS resolve
sed -i '/^hosts:/ {/resolve/! s/files/resolve [!UNAVAIL=return] files/}' "${TARGET_DIR}/etc/nsswitch.conf"

# Remove e2scrub (LVM specific tools provided by e2fsprogs)
rm -f "/usr/lib/systemd/system/e2scrub*"
rm -f "/usr/sbin/e2scrub*" "/usr/lib/e2fsprogs/e2scrub*"
}


Expand Down

0 comments on commit 4ab51e7

Please sign in to comment.