diff --git a/data/pacman-default.conf b/data/pacman-default.conf index 74474c8..55cf4fc 100644 --- a/data/pacman-default.conf +++ b/data/pacman-default.conf @@ -16,8 +16,6 @@ #GPGDir = /etc/pacman.d/gnupg/ #HookDir = /etc/pacman.d/hooks/ HoldPkg = pacman glibc -# If upgrades are available for these packages they will be asked for first -SyncFirst = manjaro-system archlinux-keyring manjaro-keyring #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled @@ -35,8 +33,7 @@ Architecture = auto #UseSyslog #Color #TotalDownload -# We cannot check disk space from within a chroot environment -#CheckSpace +CheckSpace #VerbosePkgLists # By default, pacman accepts packages signed by keys that its local keyring @@ -68,20 +65,13 @@ LocalFileSigLevel = Optional # uncommented to enable the repo. # -# The testing repositories are disabled by default. To enable, uncomment the -# repo name header and Include lines. You can add preferred servers immediately -# after the header, and they will be used before the default mirrors. - [core] -SigLevel = PackageRequired Include = /etc/pacman.d/mirrorlist [extra] -SigLevel = PackageRequired Include = /etc/pacman.d/mirrorlist [community] -SigLevel = PackageRequired Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for @@ -89,4 +79,3 @@ Include = /etc/pacman.d/mirrorlist #[custom] #SigLevel = Optional TrustAll #Server = file:///home/custompkgs - diff --git a/data/pacman-mhwd.conf b/data/pacman-mhwd.conf index b514635..2e50bd0 100644 --- a/data/pacman-mhwd.conf +++ b/data/pacman-mhwd.conf @@ -14,10 +14,12 @@ #CacheDir = /var/cache/pacman/pkg/ #LogFile = /var/log/pacman.log #GPGDir = /etc/pacman.d/gnupg/ +#HookDir = /etc/pacman.d/hooks/ HoldPkg = pacman glibc #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled +#UseDelta = 0.7 Architecture = auto # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup @@ -29,23 +31,20 @@ Architecture = auto # Misc options #UseSyslog -#UseDelta +#Color #TotalDownload CheckSpace #VerbosePkgLists -# PGP signature checking -# NOTE: None of this will work without running `pacman-key --init` first. -# The compiled in default is equivalent to the following line. This requires -# you to locally sign and trust packager keys using `pacman-key` for them to be -# considered valid. -#SigLevel = Optional TrustedOnly -# If you wish to check signatures but avoid local sign and trust issues, use -# the following line. This will treat any key imported into pacman's keyring as -# trusted. -#SigLevel = Optional TrustAll -# For now, off by default unless you read the above. -SigLevel = Never +# By default, pacman accepts packages signed by keys that its local keyring +# trusts (see pacman-key and its man page), as well as unsigned packages. +SigLevel = Required DatabaseOptional +LocalFileSigLevel = Optional +#RemoteFileSigLevel = Required + +# NOTE: You must run `pacman-key --init` before first using pacman; the local +# keyring can then be populated with the keys of all official Manjaro Linux +# packagers with `pacman-key --populate archlinux manjaro`. # # REPOSITORIES @@ -67,5 +66,4 @@ SigLevel = Never # [mhwd] -#SigLevel = Optional TrustAll Server = file:///opt/pkg diff --git a/data/pacman-multilib.conf b/data/pacman-multilib.conf index 40d984a..cc5b18e 100644 --- a/data/pacman-multilib.conf +++ b/data/pacman-multilib.conf @@ -16,8 +16,6 @@ #GPGDir = /etc/pacman.d/gnupg/ #HookDir = /etc/pacman.d/hooks/ HoldPkg = pacman glibc -# If upgrades are available for these packages they will be asked for first -SyncFirst = manjaro-system archlinux-keyring manjaro-keyring #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled @@ -35,8 +33,7 @@ Architecture = auto #UseSyslog #Color #TotalDownload -# We cannot check disk space from within a chroot environment -#CheckSpace +CheckSpace #VerbosePkgLists # By default, pacman accepts packages signed by keys that its local keyring @@ -68,27 +65,19 @@ LocalFileSigLevel = Optional # uncommented to enable the repo. # -# The testing repositories are disabled by default. To enable, uncomment the -# repo name header and Include lines. You can add preferred servers immediately -# after the header, and they will be used before the default mirrors. - [core] -SigLevel = PackageRequired Include = /etc/pacman.d/mirrorlist [extra] -SigLevel = PackageRequired Include = /etc/pacman.d/mirrorlist [community] -SigLevel = PackageRequired Include = /etc/pacman.d/mirrorlist # If you want to run 32 bit applications on your x86_64 system, # enable the multilib repositories as required here. [multilib] -SigLevel = PackageRequired Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for @@ -96,4 +85,3 @@ Include = /etc/pacman.d/mirrorlist #[custom] #SigLevel = Optional TrustAll #Server = file:///home/custompkgs - diff --git a/data/profile.conf.example b/data/profile.conf.example index 29daabf..3c5e3c2 100644 --- a/data/profile.conf.example +++ b/data/profile.conf.example @@ -35,12 +35,10 @@ # unset defaults to given values # names must match systemd service names # enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep') -# disable_systemd=() # unset defaults to given values, # names must match openrc service names # enable_openrc=('acpid' 'bluetooth' 'consolekit' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager') -# disable_openrc=() # unset defaults to given values # addgroups="video,power,disk,storage,optical,network,lp,scanner,wheel"