Git-Mirrors/qubes-doc
1
0
Fork 0
mirror of https://github.com/QubesOS/qubes-doc.git synced 2024-12-29 09:16:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix "archlinux: add spaces around '###' markers"

Browse Source 
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 2016-02-21 01:16:51 +01:00
parent e3dc58fd33
commit 6233a3369b
No known key found for this signature in database
GPG Key ID: F32894BE9684938A
1 changed files with 84 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
managing-os/templates/archlinux.md
View File

@ -396,133 +396,138 @@ Please check out:
<br> <br>
# /etc/pacman.conf # /etc/pacman.conf
# #
# See the pacman.conf(5) manpage for option and repository directives # See the pacman.conf(5) manpage for option and repository directives
# #
# GENERAL OPTIONS # GENERAL OPTIONS
# #
[options] [options]
# The following paths are commented out with their default values listed. # The following paths are commented out with their default values listed.
# If you wish to use different paths, uncomment and update the paths. # If you wish to use different paths, uncomment and update the paths.
# RootDir = / # RootDir = /
# DBPath = /var/lib/pacman/ # DBPath = /var/lib/pacman/
# CacheDir = /var/cache/pacman/pkg/ # CacheDir = /var/cache/pacman/pkg/
# LogFile = /var/log/pacman.log # LogFile = /var/log/pacman.log
GPGDir = /etc/pacman.d/gnupg/ GPGDir = /etc/pacman.d/gnupg/
HoldPkg = pacman glibc HoldPkg = pacman glibc
# XferCommand = /usr/bin/curl -C - -f %u > %o # XferCommand = /usr/bin/curl -C - -f %u > %o
# XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u # XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
# CleanMethod = KeepInstalled # CleanMethod = KeepInstalled
# UseDelta = 0.7 # UseDelta = 0.7
Architecture = auto Architecture = auto
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
# IgnorePkg = # IgnorePkg =
# IgnoreGroup = # IgnoreGroup =
# NoUpgrade = # NoUpgrade =
NoUpgrade = /etc/X11/xinit/xinitrc.d/pulseaudio NoUpgrade = /etc/X11/xinit/xinitrc.d/pulseaudio
NoUpgrade = /etc/X11/xinit/xinitrc.d/pulseaudio 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 # Misc options
# UseSyslog # UseSyslog
# Color # Color
# TotalDownload # TotalDownload
CheckSpace CheckSpace
# VerbosePkgLists # VerbosePkgLists
# By default, pacman accepts packages signed by keys that its local keyring # 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. # trusts (see pacman-key and its man page), as well as unsigned packages.
**Edited Line:** ` # SigLevel = Required DatabaseOptional`
**Edited Line:** `# SigLevel = Required DatabaseOptional`
LocalFileSigLevel = Optional LocalFileSigLevel = Optional
# RemoteFileSigLevel = Required # RemoteFileSigLevel = Required
# NOTE: You must run `pacman-key --init` before first using pacman; the local # 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 # keyring can then be populated with the keys of all official Arch Linux
# packagers with `pacman-key --populate archlinux`. # packagers with `pacman-key --populate archlinux`.
# #
# REPOSITORIES # REPOSITORIES
# - can be defined here or included from another file # - can be defined here or included from another file
# - pacman will search repositories in the order defined here # - pacman will search repositories in the order defined here
# - local/custom mirrors can be added here or in separate files # - local/custom mirrors can be added here or in separate files
# - repositories listed first will take precedence when packages # - repositories listed first will take precedence when packages
# have identical names, regardless of version number # have identical names, regardless of version number
# - URLs will have $repo replaced by the name of the current repo # - URLs will have $repo replaced by the name of the current repo
# - URLs will have $arch replaced by the name of the architecture # - URLs will have $arch replaced by the name of the architecture
# #
# Repository entries are of the format: # Repository entries are of the format:
# [repo-name] # [repo-name]
# Server = ServerName # Server = ServerName
# Include = IncludePath # Include = IncludePath
# #
# The header [repo-name] is crucial - it must be present and # The header [repo-name] is crucial - it must be present and
# uncommented to enable the repo. # uncommented to enable the repo.
# #
# The testing repositories are disabled by default. To enable, uncomment the # The testing repositories are disabled by default. To enable, uncomment the
# repo name header and Include lines. You can add preferred servers immediately # repo name header and Include lines. You can add preferred servers immediately
# after the header, and they will be used before the default mirrors. # after the header, and they will be used before the default mirrors.
# [testing] # [testing]
# SigLevel = PackageRequired # SigLevel = PackageRequired
# Include = /etc/pacman.d/mirrorlist # Include = /etc/pacman.d/mirrorlist
[core] [core]
**Edited Line:** `SigLevel = PackageRequired` **Edited Line:** `SigLevel = PackageRequired`
Include = /etc/pacman.d/mirrorlist Include = /etc/pacman.d/mirrorlist
[extra] [extra]
**Edited Line:** `SigLevel = PackageRequired` **Edited Line:** `SigLevel = PackageRequired`
Include = /etc/pacman.d/mirrorlist Include = /etc/pacman.d/mirrorlist
# [community-testing] # [community-testing]
# SigLevel = PackageRequired # SigLevel = PackageRequired
# Include = /etc/pacman.d/mirrorlist # Include = /etc/pacman.d/mirrorlist
[community] [community]
**Edited Line:** `SigLevel = PackageRequired` **Edited Line:** `SigLevel = PackageRequired`
Include = /etc/pacman.d/mirrorlist Include = /etc/pacman.d/mirrorlist
# If you want to run 32 bit applications on your x86_64 system, # If you want to run 32 bit applications on your x86_64 system,
# enable the multilib repositories as required here. # enable the multilib repositories as required here.
# [multilib-testing] # [multilib-testing]
# Include = /etc/pacman.d/mirrorlist # Include = /etc/pacman.d/mirrorlist
# [multilib] # [multilib]
# Include = /etc/pacman.d/mirrorlist # Include = /etc/pacman.d/mirrorlist
# An example of a custom package repository. See the pacman manpage for # An example of a custom package repository. See the pacman manpage for
# tips on creating your own repositories. # tips on creating your own repositories.
# [custom] # [custom]
# SigLevel = Optional TrustAll # SigLevel = Optional TrustAll
# Server = file:///home/custompkgs # Server = file:///home/custompkgs
[multilib] [multilib]
**Edited Line:** `SigLevel = PackageRequired` **Edited Line:** `SigLevel = PackageRequired`
Include = /etc/pacman.d/mirrorlist 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:** **Add Section Below:**
[xyne-x86_64] [xyne-x86_64]
# A repo for Xyne's own projects: http://xyne.archlinux.ca/projects/ # A repo for Xyne's own projects: http://xyne.archlinux.ca/projects/
# Packages for the "x86_64" architecture. # Packages for the "x86_64" architecture.
# Added for PowerPill app # Added for PowerPill app
# Note that this includes all packages in [xyne-any]. # Note that this includes all packages in [xyne-any].
SigLevel = Required SigLevel = Required
Server = http://xyne.archlinux.ca/repos/xyne 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 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> <br>