Merge branch 'master' into gnome-initial-setup

This commit is contained in:
Philip Müller 2021-01-28 10:29:43 +01:00
commit 6c07c3286b
2 changed files with 14 additions and 0 deletions

View file

@ -248,6 +248,18 @@ style:
sidebarTextHighlight: "\"${sidebartexthighlight}"\"" > $1/usr/share/calamares/branding/manjaro/branding.desc
}
configure_polkit_user_rules(){
msg2 "Configuring polkit user rules"
echo "/* Stop asking the user for a password while they are in a live session
*/
polkit.addRule(function(action, subject) {
if (subject.user == \"${username}\")
{
return polkit.Result.YES;
}
});" > $1/etc/polkit-1/rules.d/49-nopasswd-live.rules
}
configure_logind(){
msg2 "Configuring logind ..."
local conf=$1/etc/systemd/logind.conf

View file

@ -397,6 +397,8 @@ make_image_live() {
msg "Done [Distribution: Release ${dist_release} Codename ${dist_codename}]"
fi
configure_polkit_user_rules "${path}"
reset_pac_conf "${path}"
umount_fs