[PATCH v3 0/3] fix auto-generated boot options