-
Notifications
You must be signed in to change notification settings - Fork 1.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix export-image to not depend on fake-hwclock being installed #326
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.sh
script depends onfake-hwclock
being installed, since it calls/etc/init.d/fake-hwclock stop
early on.Since it's run under
bash -e
the build fails iffake-hwclock
is 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-hwclock
prior toexport-image
.I could have done this by checking if the
/etc/init.d/fake-hwclock
file 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-hwclock
is actually installed, but for some reason fails to stop, then theexport-image
script will continue anyway. My opinion is that risk is minimal, but I can change the pull request if desired.