diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config old mode 100755 new mode 100644 index eb6ec328..6ac25d22 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.34.1 -# Fri Aug 5 16:58:32 2022 +# Wed Aug 10 10:19:12 2022 # CONFIG_HAVE_DOT_CONFIG=y @@ -560,19 +560,19 @@ CONFIG_LSATTR=y # Linux Module Utilities # # CONFIG_MODPROBE_SMALL is not set -CONFIG_DEPMOD=y -CONFIG_INSMOD=y -CONFIG_LSMOD=y -CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y -CONFIG_MODINFO=y -CONFIG_MODPROBE=y -CONFIG_FEATURE_MODPROBE_BLACKLIST=y -CONFIG_RMMOD=y +# CONFIG_DEPMOD is not set +# CONFIG_INSMOD is not set +# CONFIG_LSMOD is not set +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +# CONFIG_MODINFO is not set +# CONFIG_MODPROBE is not set +# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set +# CONFIG_RMMOD is not set # # Options common to multiple modutils # -CONFIG_FEATURE_CMDLINE_MODULE_OPTIONS=y +# CONFIG_FEATURE_CMDLINE_MODULE_OPTIONS is not set # CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set # CONFIG_FEATURE_2_4_MODULES is not set # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set @@ -580,12 +580,12 @@ CONFIG_FEATURE_CMDLINE_MODULE_OPTIONS=y # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set # CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set # CONFIG_FEATURE_INSMOD_TRY_MMAP is not set -CONFIG_FEATURE_MODUTILS_ALIAS=y -CONFIG_FEATURE_MODUTILS_SYMBOLS=y -CONFIG_DEFAULT_MODULES_DIR="/lib/modules" -CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" +# CONFIG_FEATURE_MODUTILS_ALIAS is not set +# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set +CONFIG_DEFAULT_MODULES_DIR="" +CONFIG_DEFAULT_DEPMOD_FILE="" # # Linux System Utilities diff --git a/package/eudev/S10udev b/package/eudev/S10udev index d85377a6..fe4d3550 100644 --- a/package/eudev/S10udev +++ b/package/eudev/S10udev @@ -56,9 +56,9 @@ create_dev_makedev() { make_static_nodes() { [ -e /lib/modules/$(uname -r)/modules.devname ] || return 0 - [ -x /bin/kmod ] || return 0 + [ -x /usr/bin/kmod ] || return 0 - /bin/kmod static-nodes --format=tmpfiles --output=/proc/self/fd/1 | \ + /usr/bin/kmod static-nodes --format=tmpfiles --output=/proc/self/fd/1 | \ while read type name mode uid gid age arg; do [ -e $name ] && continue case "$type" in @@ -66,10 +66,6 @@ make_static_nodes() { d|d!) mkdir $name ;; *) echo "unparseable line ($type $name $mode $uid $gid $age $arg)" >&2 ;; esac - - if [ -x /sbin/restorecon ]; then - /sbin/restorecon $name - fi done } @@ -85,9 +81,6 @@ case "$1" in # clean up parts of the database created by the initramfs udev udevadm info --cleanup-db - # set the SELinux context for devices created in the initramfs - [ -x /sbin/restorecon ] && /sbin/restorecon -R /dev - printf "Populating %s using udev: " "${udev_root:-/dev}" [ -e /proc/sys/kernel/hotplug ] && printf '\000\000\000\000' > /proc/sys/kernel/hotplug /sbin/udevd -d || { echo "FAIL"; exit 1; }