[PATCH v2 0/2] fix auto-generated boot options