Fix export-image to not depend on fake-hwclock being installed#326
Fix export-image to not depend on fake-hwclock being installed#326XECDesign merged 2 commits intoRPi-Distro:masterfrom
Conversation
Update to upstream
|
Oops, I posted this too early. It still needs more work, since I missed the next line |
|
For what it's worth. When using both commits to remove the dependencies on |
|
Looks good, but maybe an |
929cf9e to
e224e30
Compare
|
Valid point. I made the changes. For checking |
|
Thank you, much appreciated. |
|
I ran a build that exported an image from |
Updated export-image to not depend on fake-hwclock and hardlink. (RPi-Distro#326)
Currently the
export-image/04-finalise/01-run.shscript depends onfake-hwclockbeing installed, since it calls/etc/init.d/fake-hwclock stopearly on.Since it's run under
bash -ethe build fails iffake-hwclockis not installed.This is not an issue for the majority of users, but it prevents images from being built prior to
stage2, and would impact any customization that removesfake-hwclockprior toexport-image.I could have done this by checking if the
/etc/init.d/fake-hwclockfile exists before executing it; however, that seemed a little extra rather than just adding the " || true" at the end of the command to force a 0 exit code. The risk with my method is iffake-hwclockis actually installed, but for some reason fails to stop, then theexport-imagescript will continue anyway. My opinion is that risk is minimal, but I can change the pull request if desired.