summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2017-04-09 13:12:14 +0200
committerPierre Schmitz <pierre@archlinux.de>2017-04-10 17:26:33 +0200
commit4a03bbb541eb9de0ffb75cbbb4f22dad527a9868 (patch)
tree742ac9dafcd51abca75095a4eda9b4cec3aa5d62
parent601fcd25268889138b7228ce932416d59d11c7eb (diff)
Use pacman.conf from devtools
-rw-r--r--Makefile2
-rw-r--r--README.md2
-rw-r--r--rootfs/etc/pacman.conf13
3 files changed, 2 insertions, 15 deletions
diff --git a/Makefile b/Makefile
index 3b93d40..567a75f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
rootfs:
$(eval TMPDIR := $(shell mktemp -d))
- pacstrap -C rootfs/etc/pacman.conf -c -d -G -M $(TMPDIR) $(shell cat packages)
+ pacstrap -C /usr/share/devtools/pacman-extra.conf -c -d -G -M $(TMPDIR) $(shell cat packages)
cp -rvp --backup --suffix=.pacnew rootfs/* $(TMPDIR)/
arch-chroot $(TMPDIR) locale-gen
arch-chroot $(TMPDIR) pacman-key --init
diff --git a/README.md b/README.md
index 830c281..e569f2a 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
This repository contains all scripts and files needed to crate a Docker base image for the Arch Linux distribution.
## Dependencies
Install the following Arch Linux packages:
-* arch-install-scripts
* make
+* devtools
## Usage
Run `make docker-image` as root to build the base image.
diff --git a/rootfs/etc/pacman.conf b/rootfs/etc/pacman.conf
deleted file mode 100644
index 9b7b455..0000000
--- a/rootfs/etc/pacman.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[options]
-Architecture = auto
-SigLevel = Required DatabaseOptional
-LocalFileSigLevel = Optional
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-[community]
-Include = /etc/pacman.d/mirrorlist