diff options
| author | xplshn <xplshn@murena.io> | 2025-02-26 05:58:34 -0300 |
|---|---|---|
| committer | xplshn <xplshn@murena.io> | 2025-02-26 05:58:34 -0300 |
| commit | cd9dd179fe9c8179735a36224bf4aa076f1117ba (patch) | |
| tree | 5bebdc213237a5cd2709c3a473106badd361a59c | |
| parent | 3268e4ae8585276b075070c1e32b732dbb001d6b (diff) | |
| download | alicelinux-cd9dd179fe9c8179735a36224bf4aa076f1117ba.tar.gz alicelinux-cd9dd179fe9c8179735a36224bf4aa076f1117ba.zip | |
mdevd: fix conflicting rc.boot file
Signed-off-by: xplshn <xplshn@murena.io>
| -rw-r--r-- | repos/core/initscripts/rc.boot | 7 | ||||
| -rw-r--r-- | repos/extra/mdevd/.files | 1 | ||||
| -rw-r--r-- | repos/extra/mdevd/abuild | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/repos/core/initscripts/rc.boot b/repos/core/initscripts/rc.boot index 0b208a17..42c80ceb 100644 --- a/repos/core/initscripts/rc.boot +++ b/repos/core/initscripts/rc.boot @@ -18,8 +18,11 @@ if [ "$(command -v udevd)" ]; then udevadm trigger --action=add --type=devices udevadm settle else - echo "/sbin/mdev" > /proc/sys/kernel/hotplug - mdev -s + # In the case the user may preffer mdevd as opposed to busybox mdev + if [ ! -d "/var/service/mdevd" ]; then + echo "/sbin/mdev" > /proc/sys/kernel/hotplug + mdev -s + fi find /sys -name 'modalias' -type f -exec cat '{}' + | sort -u | xargs modprobe -b -a 2>/dev/null ln -s /proc/self/fd /dev/fd ln -s fd/0 /dev/stdin diff --git a/repos/extra/mdevd/.files b/repos/extra/mdevd/.files index 339dd5d8..b7496fb0 100644 --- a/repos/extra/mdevd/.files +++ b/repos/extra/mdevd/.files @@ -1,6 +1,5 @@ drwxr-xr-x root/root etc/ -rw-r--r-- root/root etc/mdevd.conf.new --rw-r--r-- root/root etc/rc.boot.new drwxr-xr-x root/root etc/sv/ drwxr-xr-x root/root etc/sv/mdevd/ -rwxr-xr-x root/root etc/sv/mdevd/run.new diff --git a/repos/extra/mdevd/abuild b/repos/extra/mdevd/abuild index d904a52f..159b3f87 100644 --- a/repos/extra/mdevd/abuild +++ b/repos/extra/mdevd/abuild @@ -11,12 +11,11 @@ keep_static=1 build() { ./configure \ --prefix=/usr \ - --enable-static-libc #\ - #--disable-shared + --enable-static-libc \ + --disable-shared make make install mkdir "$PKG/etc" mv "$SRC/mdevd.conf" "$PKG/etc/mdevd.conf" - sed '/mdev/ { /#/! s/^/#/; }' /etc/rc.boot >"$PKG/etc/rc.boot" } |