From 42aae4aa7b47113a66e8d1582701590eeb930045 Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaron@archlinux.org>
Date: Sun, 15 Oct 2006 23:31:21 +0000
Subject: Applied changes from frugalware:
 http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=commitdiff;h=20061009002226-e2957-93b82621b6b060312559ea0539699f659bd9cb97.gz

---
 etc/pacman.conf | 59 ---------------------------------------------------------
 1 file changed, 59 deletions(-)
 delete mode 100644 etc/pacman.conf

(limited to 'etc/pacman.conf')

diff --git a/etc/pacman.conf b/etc/pacman.conf
deleted file mode 100644
index 72b1eec0..00000000
--- a/etc/pacman.conf
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# NOTE: If you find a mirror that is geographically close to you, please
-#       move it to the top of the server list, so pacman will choose it
-#       first.
-#
-# To re-sort your mirror lists by ping/traceroute results, use the
-# /usr/bin/sortmirrors.pl script.  It requires the "netselect" package.
-#
-#     # sortmirrors.pl </etc/pacman.conf >pacman.conf.new
-#
-
-# See the pacman manpage for option directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-LogFile     = /var/log/pacman.log
-NoUpgrade   = etc/passwd etc/group etc/shadow etc/sudoers
-NoUpgrade   = etc/fstab etc/raidtab etc/mdadm.conf etc/ld.so.conf
-NoUpgrade   = etc/inittab etc/rc.conf etc/rc.local
-NoUpgrade   = etc/modprobe.conf etc/modules.conf
-NoUpgrade   = etc/lilo.conf boot/grub/menu.lst etc/mkinitrd.conf
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-
-#
-# 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
-# 
-
-#[testing]
-#Server = ftp://ftp.archlinux.org/testing/os/i686
-
-[current]
-# Add your preferred servers here, they will be used first
-Include = /etc/pacman.d/current
-
-[extra]
-# Add your preferred servers here, they will be used first
-Include = /etc/pacman.d/extra
-
-#[unstable]
-# Add your preferred servers here, they will be used first
-#Include = /etc/pacman.d/unstable
-
-[community]
-# Add your preferred servers here, they will be used first
-Include = /etc/pacman.d/community
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#Server = file:///home/custompkgs
-
-- 
cgit v1.2.3-2-g168b