Message ID | 20220823014705.1368891-1-raj.khem@gmail.com |
---|---|
State | Accepted, archived |
Commit | ab73f6e8efb97682441f012c41d35a549e899cce |
Headers | show |
Series | [v2] rng-tools: Remove depndencies on hwrng | expand |
On 2022-08-22 21:47, Khem Raj wrote: > Delete dependency on dev-hwrng.device and systemd-udev-settle services > as they can be troublesome because difference devices may have different > devices to detect resulting in delayed boot. As Kevin pointed out to me, it's also deprecated: https://github.com/systemd/systemd/commit/77ee1783ebc8385013e95161427e1f945691ced0 ../Randy > > do not run if included in a container image > > Add EXTRA_ARGS via /etc/default/rng-tools e.g. if your device has > hw RNG then something like this > > EXTRA_ARGS="-r /dev/hwrng" > > You can also use drop-ins for enhacing systemd unit file from machine > layer via a bbappend and adding a fragment to systemd > > /etc/systemd/system/rng-tools.service.d/10-hwrng.conf > > where you can add > > [Unit] > Requires=dev-hwrng.device > After=dev-hwrng.device > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > v2: Break the sysinit.target dep cycle > > meta/recipes-support/rng-tools/rng-tools/rng-tools.service | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/meta/recipes-support/rng-tools/rng-tools/rng-tools.service b/meta/recipes-support/rng-tools/rng-tools/rng-tools.service > index 0f50890dcb..5ae2fba215 100644 > --- a/meta/recipes-support/rng-tools/rng-tools/rng-tools.service > +++ b/meta/recipes-support/rng-tools/rng-tools/rng-tools.service > @@ -1,11 +1,9 @@ > [Unit] > Description=Hardware RNG Entropy Gatherer Daemon > DefaultDependencies=no > -After=systemd-udev-settle.service > -Before=sysinit.target shutdown.target > -Requires=dev-hwrng.device > -After=dev-hwrng.device > Conflicts=shutdown.target > +Before=sysinit.target shutdown.target > +ConditionVirtualization=!container > > [Service] > EnvironmentFile=-@SYSCONFDIR@/default/rng-tools > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#169691): https://lists.openembedded.org/g/openembedded-core/message/169691 > Mute This Topic: https://lists.openembedded.org/mt/93196191/3616765 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [randy.macleod@windriver.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta/recipes-support/rng-tools/rng-tools/rng-tools.service b/meta/recipes-support/rng-tools/rng-tools/rng-tools.service index 0f50890dcb..5ae2fba215 100644 --- a/meta/recipes-support/rng-tools/rng-tools/rng-tools.service +++ b/meta/recipes-support/rng-tools/rng-tools/rng-tools.service @@ -1,11 +1,9 @@ [Unit] Description=Hardware RNG Entropy Gatherer Daemon DefaultDependencies=no -After=systemd-udev-settle.service -Before=sysinit.target shutdown.target -Requires=dev-hwrng.device -After=dev-hwrng.device Conflicts=shutdown.target +Before=sysinit.target shutdown.target +ConditionVirtualization=!container [Service] EnvironmentFile=-@SYSCONFDIR@/default/rng-tools
Delete dependency on dev-hwrng.device and systemd-udev-settle services as they can be troublesome because difference devices may have different devices to detect resulting in delayed boot. do not run if included in a container image Add EXTRA_ARGS via /etc/default/rng-tools e.g. if your device has hw RNG then something like this EXTRA_ARGS="-r /dev/hwrng" You can also use drop-ins for enhacing systemd unit file from machine layer via a bbappend and adding a fragment to systemd /etc/systemd/system/rng-tools.service.d/10-hwrng.conf where you can add [Unit] Requires=dev-hwrng.device After=dev-hwrng.device Signed-off-by: Khem Raj <raj.khem@gmail.com> --- v2: Break the sysinit.target dep cycle meta/recipes-support/rng-tools/rng-tools/rng-tools.service | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)