From 0833d3be327b18f134b28281a8ba78020554977e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sat, 30 Jun 2018 09:17:12 +0200 Subject: [PATCH] [profile.conf] remove pre-systemd default groups --- community/awesome/profile.conf | 2 +- community/bspwm-mate/profile.conf | 2 +- community/bspwm/profile.conf | 2 +- community/budgie/profile.conf | 2 +- community/cinnamon/profile.conf | 2 +- community/deepin/profile.conf | 2 +- community/i3/profile.conf | 2 +- community/kde-minimal/profile.conf | 72 +++++++++++++++++ community/lxde/profile.conf | 2 +- community/lxqt/profile.conf | 2 +- community/mate/profile.conf | 2 +- community/openbox-basic/profile.conf | 69 ++++++++++++++++ community/openbox-minimal/profile.conf | 79 +++++++++++++++++++ .../calamares/branding/manjaro/branding.desc | 23 ------ community/openbox/profile.conf | 2 +- community/webdad/profile.conf | 2 +- manjaro/architect/profile.conf | 8 +- manjaro/gnome/profile.conf | 2 +- manjaro/kde/profile.conf | 2 +- manjaro/netinstall/profile.conf | 2 +- manjaro/xfce/profile.conf | 2 +- 21 files changed, 238 insertions(+), 45 deletions(-) create mode 100644 community/kde-minimal/profile.conf create mode 100644 community/openbox-basic/profile.conf create mode 100644 community/openbox-minimal/profile.conf delete mode 100644 community/openbox/live-overlay/usr/share/calamares/branding/manjaro/branding.desc diff --git a/community/awesome/profile.conf b/community/awesome/profile.conf index 588a7fda..4bb27e37 100755 --- a/community/awesome/profile.conf +++ b/community/awesome/profile.conf @@ -51,7 +51,7 @@ hostname="manjaro-awesome" login_shell=/bin/zsh # unset defaults to given values -# addgroups="video,audio,power,disk,storage,optical,network,lp,scanner,wheel" +# addgroups="lp,network,power,wheel" # unset defaults to given values # names must match systemd service names diff --git a/community/bspwm-mate/profile.conf b/community/bspwm-mate/profile.conf index 89cebb8c..9a00b8d6 100755 --- a/community/bspwm-mate/profile.conf +++ b/community/bspwm-mate/profile.conf @@ -51,7 +51,7 @@ hostname="manjaro-bspwm" login_shell=/bin/zsh # unset defaults to given values -# addgroups="video,audio,power,disk,storage,optical,network,lp,scanner,wheel" +# addgroups="lp,network,power,wheel" # unset defaults to given values # names must match systemd service names diff --git a/community/bspwm/profile.conf b/community/bspwm/profile.conf index 2b2cbf39..76f19290 100755 --- a/community/bspwm/profile.conf +++ b/community/bspwm/profile.conf @@ -51,7 +51,7 @@ hostname="manjaro-bspwm" login_shell=/bin/zsh # unset defaults to given values -# addgroups="video,audio,power,disk,storage,optical,network,lp,scanner,wheel" +# addgroups="lp,network,power,wheel" # unset defaults to given values # names must match systemd service names diff --git a/community/budgie/profile.conf b/community/budgie/profile.conf index 75ca33d4..0a47b878 100644 --- a/community/budgie/profile.conf +++ b/community/budgie/profile.conf @@ -42,7 +42,7 @@ displaymanager="lightdm" # disable_openrc=() # unset defaults to given values -# addgroups="video,power,disk,storage,optical,network,lp,scanner,wheel" +# addgroups="lp,network,power,wheel" # the same workgroup name if samba is used # smb_workgroup="" diff --git a/community/cinnamon/profile.conf b/community/cinnamon/profile.conf index d154c8cc..6afc60b9 100644 --- a/community/cinnamon/profile.conf +++ b/community/cinnamon/profile.conf @@ -38,7 +38,7 @@ enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManag disable_systemd=('pacman-init') # unset defaults to given values -# addgroups="video,power,disk,storage,optical,network,lp,scanner,wheel" +# addgroups="lp,network,power,wheel" # the same workgroup name if samba is used # smb_workgroup="Manjaro" diff --git a/community/deepin/profile.conf b/community/deepin/profile.conf index e63a9e58..e6bf72b2 100644 --- a/community/deepin/profile.conf +++ b/community/deepin/profile.conf @@ -38,7 +38,7 @@ enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManag disable_systemd=('pacman-init') # unset defaults to given values -# addgroups="video,power,disk,storage,optical,network,lp,scanner,wheel" +# addgroups="lp,network,power,wheel" # the same workgroup name if samba is used # smb_workgroup="" diff --git a/community/i3/profile.conf b/community/i3/profile.conf index d4982872..20205a61 100644 --- a/community/i3/profile.conf +++ b/community/i3/profile.conf @@ -38,7 +38,7 @@ enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManag disable_systemd=('pacman-init') # unset defaults to given values -# addgroups="video,power,disk,storage,optical,network,lp,scanner,wheel" +# addgroups="lp,network,power,wheel" # the same workgroup name if samba is used # smb_workgroup="Manjaro" diff --git a/community/kde-minimal/profile.conf b/community/kde-minimal/profile.conf new file mode 100644 index 00000000..e44afe2e --- /dev/null +++ b/community/kde-minimal/profile.conf @@ -0,0 +1,72 @@ +########################################## +###### use this file in the profile ###### +########################################## + +# use multilib packages; x86_64 only +# multilib="true" + +displaymanager="sddm" + +# Set to false to disable autologin in the livecd +# autologin="true" + +# nonfree mhwd drivers +# nonfree_mhwd="false" + +# use extra packages as defined in pkglist to activate a full profile +extra="false" + +################ install ################ + +# unset defaults to given value +# efi_boot_loader="grub" + +# configure calamares for netinstall +# netinstall="false" + +# configure calamares to use chrootcfg instead of unpackfs +# chrootcfg="false" + +# use geoip for localization +# geoip='true' + +# unset defaults to given values +# names must match systemd service names +enable_systemd=( 'systemd-resolved' 'systemd-networkd' ) +disable_systemd=('pacman-init') + +# unset defaults to given values, +# names must match openrc service names +# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') +# disable_openrc=() + +# the same workgroup name if samba is used +# smb_workgroup="" + +################# livecd ################# + +# unset defaults to given value +# hostname="manjaro" + +# unset defaults to given value +# username="manjaro" + +# unset defaults to given value +# password="manjaro" + +# the login shell +# defaults to bash +# login_shell=/bin/bash + +# unset defaults to given values +# addgroups="lp,network,power,wheel" + +# unset defaults to given values +# names must match systemd service names +# services in enable_systemd array don't need to be listed here +enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live' 'systemd-resolved' 'systemd-networkd') + +# unset defaults to given values, +# names must match openrc service names +# services in enable_openrc array don't need to be listed here +# enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live') diff --git a/community/lxde/profile.conf b/community/lxde/profile.conf index 0ec37781..cfb58171 100644 --- a/community/lxde/profile.conf +++ b/community/lxde/profile.conf @@ -44,7 +44,7 @@ displaymanager="lightdm" # disable_openrc=() # unset defaults to given values -# addgroups="video,power,storage,optical,network,lp,scanner,wheel" +#addgroups="lp,network,power,wheel" # the same workgroup name if samba is used # smb_workgroup="Manjaro" diff --git a/community/lxqt/profile.conf b/community/lxqt/profile.conf index de268f2d..8ea2e2d0 100644 --- a/community/lxqt/profile.conf +++ b/community/lxqt/profile.conf @@ -38,7 +38,7 @@ chrootcfg="true" # login_shell=/bin/bash # unset defaults to given values -# addgroups="video,audio,power,storage,optical,network,lp,scanner,wheel" +# addgroups="lp,network,power,wheel" # unset defaults to given values # names must match systemd service names diff --git a/community/mate/profile.conf b/community/mate/profile.conf index 4ef386b9..df2d6a1e 100644 --- a/community/mate/profile.conf +++ b/community/mate/profile.conf @@ -43,7 +43,7 @@ displaymanager="lightdm" # disable_openrc=() # unset defaults to given values -# addgroups="video,power,disk,storage,optical,network,lp,scanner,wheel" +# addgroups="lp,network,power,wheel" # the same workgroup name if samba is used # smb_workgroup="" diff --git a/community/openbox-basic/profile.conf b/community/openbox-basic/profile.conf new file mode 100644 index 00000000..394d610c --- /dev/null +++ b/community/openbox-basic/profile.conf @@ -0,0 +1,69 @@ +########################################## +###### use this file in the profile ###### +########################################## + +# use multilib packages; x86_64 only +multilib="false" + +# displaymanager +displaymanager="lightdm" + +# Set to false to disable autologin in the livecd +autologin="true" + +# nonfree mhwd drivers +nonfree_mhwd="true" + +# use extra packages as defined in pkglist to activate a full profile +extra="true" + +################ install ################ + +# unset defaults to given value +efi_boot_loader="grub" + +# configure calamares for netinstall +#netinstall="false" + +# configure calamares to use chrootcfg instead of unpackfs +#chrootcfg="false" + +# use geoip for localization +geoip="true" + +# unset defaults to given values +# names must match systemd service names +enable_systemd=('NetworkManager') +disable_systemd=('pacman-init') + +# the same workgroup name if samba is used +# smb_workgroup="" + +# default system shell is bash +# '/etc/defaults/useradd': " " +# userShell : "/bin/zsh" +# empty value will not be used +user_shell="/bin/zsh" + +################# livecd ################# + +# unset defaults to given value +hostname="manjaro-openbox" + +# unset defaults to given value +# username="manjaro" + +# unset defaults to given value +# password="manjaro" + +# the login shell +# defaults to bash +login_shell=/bin/zsh + +# unset defaults to given values +# addgroups="lp,network,power,wheel" + +# unset defaults to given values +# names must match systemd service names +# services in enable_systemd array don't need to be listed here +enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live' 'NetworkManager') diff --git a/community/openbox-minimal/profile.conf b/community/openbox-minimal/profile.conf new file mode 100644 index 00000000..420f6b8e --- /dev/null +++ b/community/openbox-minimal/profile.conf @@ -0,0 +1,79 @@ +########################################## +###### use this file in the profile ###### +########################################## + +# use multilib packages; x86_64 only +multilib="false" + +# displaymanager +displaymanager="lightdm" + +# Set to false to disable autologin in the livecd +autologin="true" + +# nonfree mhwd drivers +nonfree_mhwd="true" + +# use extra packages as defined in pkglist to activate a full profile +extra="false" + +################ install ################ + +# unset defaults to given value +efi_boot_loader="grub" + +# configure calamares for netinstall +#netinstall="false" + +# configure calamares to use chrootcfg instead of unpackfs +#chrootcfg="false" + +# use geoip for localization +geoip='true' + +# unset defaults to given values +# names must match systemd service names +enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'ufw') +disable_systemd=('pacman-init') + +# unset defaults to given values, +# names must match openrc service names +# enable_openrc=('acpid' 'bluetooth' 'elogind' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') +# disable_openrc=() + +# the same workgroup name if samba is used +# smb_workgroup="" + +# default system shell is bash +# '/etc/defaults/useradd': " " +# userShell : "/bin/zsh" +# empty value will not be used +user_shell="/bin/zsh" + +################# livecd ################# + +# unset defaults to given value +hostname="manjaro-openbox" + +# unset defaults to given value +# username="manjaro" + +# unset defaults to given value +# password="manjaro" + +# the login shell +# defaults to bash +login_shell="/bin/zsh" + +# unset defaults to given values +# addgroups="lp,network,power,wheel" + +# unset defaults to given values +# names must match systemd service names +# services in enable_systemd array don't need to be listed here +enable_systemd_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live' 'NetworkManager') + +# unset defaults to given values, +# names must match openrc service names +# services in enable_openrc array don't need to be listed here +# enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live') diff --git a/community/openbox/live-overlay/usr/share/calamares/branding/manjaro/branding.desc b/community/openbox/live-overlay/usr/share/calamares/branding/manjaro/branding.desc deleted file mode 100644 index d5e30b5e..00000000 --- a/community/openbox/live-overlay/usr/share/calamares/branding/manjaro/branding.desc +++ /dev/null @@ -1,23 +0,0 @@ ---- -componentName: manjaro - -strings: - productName: Manjaro Linux - shortProductName: Manjaro - version: 18.0-alpha-1 - shortVersion: 18.0a1 - versionedName: Manjaro Linux 18.0-alpha-1 "Illyria" - shortVersionedName: Manjaro 18.0a1 - bootloaderEntryName: Manjaro - -images: - productLogo: "logo.png" - productIcon: "logo.png" - productWelcome: "languages.png" - -slideshow: "show.qml" - -style: - sidebarBackground: "#454948" - sidebarText: "#efefef" - sidebarTextSelect: "#9E4F5D" diff --git a/community/openbox/profile.conf b/community/openbox/profile.conf index 5d7ab37d..ee57a358 100644 --- a/community/openbox/profile.conf +++ b/community/openbox/profile.conf @@ -60,7 +60,7 @@ hostname="openbox-manjaro" login_shell=/bin/zsh # unset defaults to given values -# addgroups="video,audio,power,disk,storage,optical,network,lp,scanner,wheel" +# addgroups="lp,network,power,wheel" # unset defaults to given values # names must match systemd service names diff --git a/community/webdad/profile.conf b/community/webdad/profile.conf index 8ed29ed3..f3b39661 100644 --- a/community/webdad/profile.conf +++ b/community/webdad/profile.conf @@ -59,7 +59,7 @@ disable_systemd=('pacman-init') # login_shell=/bin/bash # unset defaults to given values -# addgroups="video,audio,power,disk,storage,optical,network,lp,scanner,wheel" +# addgroups="lp,network,power,wheel" # unset defaults to given values # names must match systemd service names diff --git a/manjaro/architect/profile.conf b/manjaro/architect/profile.conf index 53fb27db..70661b15 100644 --- a/manjaro/architect/profile.conf +++ b/manjaro/architect/profile.conf @@ -1,13 +1,9 @@ +extra=true # to avoid 'minimal' filename multilib='false' - nonfree_mhwd="false" - -addgroups="power,disk,storage,network,lp,wheel" - +addgroups="lp,network,power,wheel" hostname="manjaro-architect" - enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep') - enable_systemd_live=('manjaro-live' 'mirrors-live' 'pacman-init') # login_shell=/bin/bash diff --git a/manjaro/gnome/profile.conf b/manjaro/gnome/profile.conf index e10a84a9..d089b33b 100644 --- a/manjaro/gnome/profile.conf +++ b/manjaro/gnome/profile.conf @@ -43,7 +43,7 @@ enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.c # disable_openrc=() # unset defaults to given values -# addgroups="video,power,disk,storage,optical,network,lp,scanner,wheel" +# addgroups="lp,network,power,wheel" # the same workgroup name if samba is used # smb_workgroup="" diff --git a/manjaro/kde/profile.conf b/manjaro/kde/profile.conf index 95f49342..74304454 100644 --- a/manjaro/kde/profile.conf +++ b/manjaro/kde/profile.conf @@ -60,7 +60,7 @@ disable_systemd=('pacman-init') # login_shell=/bin/bash # unset defaults to given values -# addgroups="video,audio,power,disk,storage,optical,network,lp,scanner,wheel" +# addgroups="lp,network,power,wheel" # unset defaults to given values # names must match systemd service names diff --git a/manjaro/netinstall/profile.conf b/manjaro/netinstall/profile.conf index ecf61dac..078b6637 100644 --- a/manjaro/netinstall/profile.conf +++ b/manjaro/netinstall/profile.conf @@ -38,7 +38,7 @@ chrootcfg="true" # login_shell=/bin/bash # unset defaults to given values -# addgroups="video,audio,power,disk,storage,optical,network,lp,scanner,wheel" +# addgroups="lp,network,power,wheel" # unset defaults to given values # names must match systemd service names diff --git a/manjaro/xfce/profile.conf b/manjaro/xfce/profile.conf index 8be00855..ff106c05 100644 --- a/manjaro/xfce/profile.conf +++ b/manjaro/xfce/profile.conf @@ -59,7 +59,7 @@ disable_systemd=('pacman-init') # login_shell=/bin/bash # unset defaults to given values -# addgroups="video,audio,power,disk,storage,optical,network,lp,scanner,wheel" +# addgroups="lp,network,power,wheel" # unset defaults to given values # names must match systemd service names