Trying fix for non-gentoo base system when building

Possible fix 2

Possible fix 3

Possibly final fix for os-detecting

Re-testing