diff options
| author | Laurent Bercot <ska-devel@skarnet.org> | 2022-08-30 05:47:51 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2022-11-08 15:10:59 +0000 |
| commit | 01924fe527c2c8d2e2a4a6700f9c65aea07bb4ef (patch) | |
| tree | 931ab7889ae64042636dd9127b4b698a4bb62120 | |
| parent | 6538fa7b249fbaac6f75465e202e67b93dbcaa4c (diff) | |
| download | alpine-conf-01924fe527c2c8d2e2a4a6700f9c65aea07bb4ef.zip | |
setup-devd: adapt to the busybox-mdev-openrc split
The mdev init script isn't guaranteed to be there anymore;
we explicitly add the busybox-mdev-openrc package when choosing
mdev as our device manager.
Signed-off-by: Laurent Bercot <ska@appnovation.com>
| -rw-r--r-- | setup-devd.in | 3 | ||||
| -rwxr-xr-x | tests/setup_devd_test | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/setup-devd.in b/setup-devd.in index 0695832..0b491d9 100644 --- a/setup-devd.in +++ b/setup-devd.in @@ -37,8 +37,7 @@ disable_mdev () { } enable_mdev () { - # mdev openrc script is provided by busybox-initscripts which is assumed - # to be there + $MOCK apk add --quiet busybox-mdev-openrc rc-update add --quiet mdev sysinit rc-update add --quiet hwdrivers sysinit rc-service mdev --ifstopped start diff --git a/tests/setup_devd_test b/tests/setup_devd_test index 923c295..3cf92a2 100755 --- a/tests/setup_devd_test +++ b/tests/setup_devd_test @@ -23,7 +23,7 @@ setup_devd_mdev_body() { init_env init_mdev atf_check -s exit:0 \ - -o empty \ + -o match:"apk add.*busybox-mdev-openrc" \ -e empty \ setup-devd mdev } |