Factor out wait for /dev/.coldboot to separate command #168
Conversation
|
I'm fine with merging this. @dodoradio do you agree? |
|
I don't think it's a good idea to add a second init system to all builds just because hybris is our current default porting strategy. |
|
@dodoradio has suggested that a better approach might be to conditionally add the check for |
|
I could create two different versions of Then we could selectively choose which one to install, based on whether the target it |
|
I agree with @dodoradio here :)
I'd approve that but I wonder if it'll be more maintainable to have a |
This adds a new asteroid-launcher-precondition shell script which waits for the existence of a /dev/.coldboot_done file only on machines that have the android-boot-completed.service installed. This allows both real watches and the qemux86 simulator to boot properly to a GUI. Signed-off-by: Ed Beroset <beroset@ieee.org>
This adds the asteroid-launcher-precondition shell script to the installation. Signed-off-by: Ed Beroset <beroset@ieee.org>
This uses the new asteroid-launcher-precondition command instead of inlining a one-line shell command. This fixes #259 and allows both watches and the emulator to properly boot to a GUI screen. Signed-off-by: Ed Beroset <beroset@ieee.org>
beroset
force-pushed
the
add-android-init
branch
from
3d36b39
to
8075630
Compare
beroset
changed the title
|
This version was tested on both |
| @@ -7,7 +7,7 @@ ConditionUser=!root | |||
| Type=notify | |||
| WorkingDirectory=/ | |||
| EnvironmentFile=-/var/lib/environment/compositor/*.conf | |||
| ExecStartPre=/bin/sh -ec 'while [ ! -f /dev/.coldboot_done ]; do sleep 1; done' | |||
| ExecStartPre=/usr/bin/asteroid-launcher-precondition | |||
| ExecStartPre=-/bin/sh -ec '/bin/echo QUIT > /run/psplash_fifo' | |||
There was a problem hiding this comment.
What's your opinion on moving this to the new script as well?
There was a problem hiding this comment.
I'm not sure what you're asking. Do you mean adding the -bin/sh -ec '/bin/echo QUIT > /run/psplash_fifo' line to the new script? If so, then I'm fine with that and will do that. If not, please explain further.
|
Thank you! |
Every target except for the qemux86 target included android-init indirectly as part of the conf/machine/include/hybris-watch.inc file that each image includes. Without this, asteroid-launcher for qemux86 never starts because it is waiting for something to create the file /dev/.coldboot_done. Since every target except qemux86 already includes android-init, this does not affect any other target but fixes AsteroidOS/asteroid#259 for qemux86.