Several changes didn't properly deal with openSUSE, so fix this. Change-Id: Icc9c894031a8a693d9c41e2ec5717bd76f618342