add thus and calamares changes also to cli-installer