diff --git a/packages/sysutils/busybox/config/busybox-init.conf b/packages/sysutils/busybox/config/busybox-init.conf index 1f53a3067..ea14df663 100644 --- a/packages/sysutils/busybox/config/busybox-init.conf +++ b/packages/sysutils/busybox/config/busybox-init.conf @@ -573,12 +573,12 @@ CONFIG_CHATTR=y # CONFIG_MODPROBE_SMALL is not set # CONFIG_DEPMOD is not set CONFIG_INSMOD=y -# CONFIG_LSMOD is not set +CONFIG_LSMOD=y # CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set -# CONFIG_MODINFO is not set -# CONFIG_MODPROBE is not set +CONFIG_MODINFO=y +CONFIG_MODPROBE=y # CONFIG_FEATURE_MODPROBE_BLACKLIST is not set -# CONFIG_RMMOD is not set +CONFIG_RMMOD=y # # Options common to multiple modutils @@ -1056,10 +1056,10 @@ CONFIG_FEATURE_FAST_TOP=y # CONFIG_FREE is not set # CONFIG_FUSER is not set # CONFIG_IOSTAT is not set -# CONFIG_KILL is not set -# CONFIG_KILLALL is not set +CONFIG_KILL=y +CONFIG_KILLALL=y # CONFIG_KILLALL5 is not set -# CONFIG_LSOF is not set +CONFIG_LSOF=y # CONFIG_MPSTAT is not set # CONFIG_NMETER is not set # CONFIG_PGREP is not set diff --git a/packages/sysutils/busybox/scripts/fs-resize b/packages/sysutils/busybox/scripts/fs-resize index 0906073c4..25e398c86 100755 --- a/packages/sysutils/busybox/scripts/fs-resize +++ b/packages/sysutils/busybox/scripts/fs-resize @@ -62,7 +62,7 @@ fi # Remove all of the modules that may be loaded to see if /flash will cleanly unmount. for module in $(lsmod | awk '{print $1}') do - rmmod ${module} 2>/dev/null + modprobe -r --remove-dependencies ${module} &>/dev/null done shutdown -r now &>/dev/null diff --git a/packages/sysutils/systemd/system.d/userconfig.service b/packages/sysutils/systemd/system.d/userconfig.service index 50f194af5..39ff7ef64 100644 --- a/packages/sysutils/systemd/system.d/userconfig.service +++ b/packages/sysutils/systemd/system.d/userconfig.service @@ -7,7 +7,7 @@ After=systemd-tmpfiles-setup.service Type=oneshot ExecStart=/usr/bin/userconfig-setup RemainAfterExit=yes -StandardOutput=syslog+console +StandardOutput=journal+console [Install] WantedBy=sysinit.target