mirror of
https://github.com/QubesOS/qubes-doc.git
synced 2024-12-28 16:59:40 -05:00
Fix "archlinux: add spaces around '###' markers"
Remove unnecessary spaces added in config dump. Add some empty lines to
fix formatting ("Edited Line:" folded into preceding line).
This commit is contained in:
Marek Marczykowski-Górecki
parent
e3dc58fd33
commit
6233a3369b
@ -396,133 +396,138 @@ Please check out:
|
||||
<br>
|
||||
|
||||
|
||||
# /etc/pacman.conf
|
||||
#
|
||||
# See the pacman.conf(5) manpage for option and repository directives
|
||||
# /etc/pacman.conf
|
||||
#
|
||||
# See the pacman.conf(5) manpage for option and repository directives
|
||||
|
||||
#
|
||||
# GENERAL OPTIONS
|
||||
#
|
||||
#
|
||||
# GENERAL OPTIONS
|
||||
#
|
||||
[options]
|
||||
# The following paths are commented out with their default values listed.
|
||||
# If you wish to use different paths, uncomment and update the paths.
|
||||
# RootDir = /
|
||||
# DBPath = /var/lib/pacman/
|
||||
# CacheDir = /var/cache/pacman/pkg/
|
||||
# LogFile = /var/log/pacman.log
|
||||
# The following paths are commented out with their default values listed.
|
||||
# If you wish to use different paths, uncomment and update the paths.
|
||||
# RootDir = /
|
||||
# DBPath = /var/lib/pacman/
|
||||
# CacheDir = /var/cache/pacman/pkg/
|
||||
# LogFile = /var/log/pacman.log
|
||||
GPGDir = /etc/pacman.d/gnupg/
|
||||
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
|
||||
# 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
|
||||
# IgnorePkg =
|
||||
# IgnoreGroup =
|
||||
# NoUpgrade =
|
||||
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
|
||||
# IgnorePkg =
|
||||
# IgnoreGroup =
|
||||
# NoUpgrade =
|
||||
NoUpgrade = /etc/X11/xinit/xinitrc.d/pulseaudio
|
||||
NoUpgrade = /etc/X11/xinit/xinitrc.d/pulseaudio
|
||||
NoUpgrade = /etc/X11/xinit/xinitrc.d/pulseaudio
|
||||
# NoExtract =
|
||||
# NoExtract =
|
||||
|
||||
# Misc options
|
||||
# UseSyslog
|
||||
# Color
|
||||
# TotalDownload
|
||||
# Misc options
|
||||
# UseSyslog
|
||||
# Color
|
||||
# TotalDownload
|
||||
CheckSpace
|
||||
# VerbosePkgLists
|
||||
# VerbosePkgLists
|
||||
|
||||
# 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.
|
||||
**Edited Line:** ` # SigLevel = Required DatabaseOptional`
|
||||
# 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.
|
||||
|
||||
**Edited Line:** `# SigLevel = Required DatabaseOptional`
|
||||
|
||||
LocalFileSigLevel = Optional
|
||||
# RemoteFileSigLevel = Required
|
||||
# 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 Arch Linux
|
||||
# packagers with `pacman-key --populate archlinux`.
|
||||
# NOTE: You must run `pacman-key --init` before first using pacman; the local
|
||||
# keyring can then be populated with the keys of all official Arch Linux
|
||||
# packagers with `pacman-key --populate archlinux`.
|
||||
|
||||
#
|
||||
# REPOSITORIES
|
||||
# - can be defined here or included from another file
|
||||
# - pacman will search repositories in the order defined here
|
||||
# - local/custom mirrors can be added here or in separate files
|
||||
# - repositories listed first will take precedence when packages
|
||||
# have identical names, regardless of version number
|
||||
# - URLs will have $repo replaced by the name of the current repo
|
||||
# - URLs will have $arch replaced by the name of the architecture
|
||||
#
|
||||
# Repository entries are of the format:
|
||||
# [repo-name]
|
||||
# Server = ServerName
|
||||
# Include = IncludePath
|
||||
#
|
||||
# The header [repo-name] is crucial - it must be present and
|
||||
# uncommented to enable the repo.
|
||||
#
|
||||
#
|
||||
# REPOSITORIES
|
||||
# - can be defined here or included from another file
|
||||
# - pacman will search repositories in the order defined here
|
||||
# - local/custom mirrors can be added here or in separate files
|
||||
# - repositories listed first will take precedence when packages
|
||||
# have identical names, regardless of version number
|
||||
# - URLs will have $repo replaced by the name of the current repo
|
||||
# - URLs will have $arch replaced by the name of the architecture
|
||||
#
|
||||
# Repository entries are of the format:
|
||||
# [repo-name]
|
||||
# Server = ServerName
|
||||
# Include = IncludePath
|
||||
#
|
||||
# The header [repo-name] is crucial - it must be present and
|
||||
# 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.
|
||||
# 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.
|
||||
|
||||
# [testing]
|
||||
# SigLevel = PackageRequired
|
||||
# Include = /etc/pacman.d/mirrorlist
|
||||
# [testing]
|
||||
# SigLevel = PackageRequired
|
||||
# Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[core]
|
||||
|
||||
**Edited Line:** `SigLevel = PackageRequired`
|
||||
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[extra]
|
||||
|
||||
**Edited Line:** `SigLevel = PackageRequired`
|
||||
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
# [community-testing]
|
||||
# SigLevel = PackageRequired
|
||||
# Include = /etc/pacman.d/mirrorlist
|
||||
# [community-testing]
|
||||
# SigLevel = PackageRequired
|
||||
# Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[community]
|
||||
|
||||
**Edited Line:** `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.
|
||||
# If you want to run 32 bit applications on your x86_64 system,
|
||||
# enable the multilib repositories as required here.
|
||||
|
||||
# [multilib-testing]
|
||||
# Include = /etc/pacman.d/mirrorlist
|
||||
# [multilib-testing]
|
||||
# Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
# [multilib]
|
||||
# Include = /etc/pacman.d/mirrorlist
|
||||
# [multilib]
|
||||
# Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
# An example of a custom package repository. See the pacman manpage for
|
||||
# tips on creating your own repositories.
|
||||
# [custom]
|
||||
# SigLevel = Optional TrustAll
|
||||
# Server = file:///home/custompkgs
|
||||
# An example of a custom package repository. See the pacman manpage for
|
||||
# tips on creating your own repositories.
|
||||
# [custom]
|
||||
# SigLevel = Optional TrustAll
|
||||
# Server = file:///home/custompkgs
|
||||
|
||||
[multilib]
|
||||
|
||||
**Edited Line:** `SigLevel = PackageRequired`
|
||||
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
**Edited Line:** ` # [qubes]`
|
||||
**Edited Line:** `# [qubes]`
|
||||
|
||||
**Edited Line:** ` # Server = http://olivier.medoc.free.fr/archlinux/pkgs/`
|
||||
**Edited Line:** `# Server = http://olivier.medoc.free.fr/archlinux/pkgs/`
|
||||
|
||||
**Add Section Below:**
|
||||
|
||||
[xyne-x86_64]
|
||||
# A repo for Xyne's own projects: http://xyne.archlinux.ca/projects/
|
||||
# Packages for the "x86_64" architecture.
|
||||
# Added for PowerPill app
|
||||
# Note that this includes all packages in [xyne-any].
|
||||
# A repo for Xyne's own projects: http://xyne.archlinux.ca/projects/
|
||||
# Packages for the "x86_64" architecture.
|
||||
# Added for PowerPill app
|
||||
# Note that this includes all packages in [xyne-any].
|
||||
SigLevel = Required
|
||||
Server = http://xyne.archlinux.ca/repos/xyne
|
||||
|
||||
@ -667,9 +672,9 @@ Note: For info on Reflector and its configs: [Reflector](https://wiki.archlinux.
|
||||
|
||||
#### **Qubes Mailing List Threads on the Archlinux build process:** ####
|
||||
|
||||
* [Qubes-Devel](https://groups.google.com/forum/ # !forum/qubes-devel): [Qubes Builder failed Archlinux repository is missing](https://groups.google.com/forum/#!topic/qubes-devel/tIFkS-rPVx8)
|
||||
* [Qubes-Devel](https://groups.google.com/forum/#!forum/qubes-devel): [Qubes Builder failed Archlinux repository is missing](https://groups.google.com/forum/#!topic/qubes-devel/tIFkS-rPVx8)
|
||||
|
||||
* [Qubes-Users](https://groups.google.com/forum/ # !forum/qubes-users): [Trying to compile archlinux template](https://groups.google.com/forum/#!topic/qubes-users/7wuwr3LgkQQ)
|
||||
* [Qubes-Users](https://groups.google.com/forum/#!forum/qubes-users): [Trying to compile archlinux template](https://groups.google.com/forum/#!topic/qubes-users/7wuwr3LgkQQ)
|
||||
|
||||
<br>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user