Version 2 of the patch is attached. This version also uses
the custom package for /run/current-system/profile/bin/shepherd.