@@ -14,6 +14,7 @@ hash expect &>/dev/null || {

 	exit 1

 }

+

 export LANG="C.UTF-8"

 ROOTFS=$(mktemp -d ${TMPDIR:-/var/tmp}/rootfs-archlinux-XXXXXXXXXX)

@@ -47,15 +48,43 @@ IFS=','

 PKGIGNORE="${PKGIGNORE[*]}"

 unset IFS

+case "$(uname -m)" in

+	armv*)

+		if pacman -Q archlinuxarm-keyring >/dev/null 2>&1; then

+			pacman-key --init

+			pacman-key --populate archlinuxarm

+		else

+			echo "Could not find archlinuxarm-keyring. Please, install it and run pacman-key --populate archlinuxarm"

+			exit 1

+		fi

+		PACMAN_CONF='./mkimage-archarm-pacman.conf'

+		PACMAN_MIRRORLIST='Server = http://mirror.archlinuxarm.org/$arch/$repo'

+		PACMAN_EXTRA_PKGS='archlinuxarm-keyring'

+		EXPECT_TIMEOUT=120

+		ARCH_KEYRING=archlinuxarm

+		DOCKER_IMAGE_NAME=archlinuxarm

+		;;

+	*)

+		PACMAN_CONF='./mkimage-arch-pacman.conf'

+		PACMAN_MIRRORLIST='Server = https://mirrors.kernel.org/archlinux/$repo/os/$arch'

+		PACMAN_EXTRA_PKGS=''

+		EXPECT_TIMEOUT=60

+		ARCH_KEYRING=archlinux

+		DOCKER_IMAGE_NAME=archlinux

+		;;

+esac

+

+export PACMAN_MIRRORLIST

+

 expect <<EOF

 	set send_slow {1 .1}

 	proc send {ignore arg} {

 		sleep .1

 		exp_send -s -- \$arg

 	}

-	set timeout 60

+	set timeout $EXPECT_TIMEOUT

-	spawn pacstrap -C ./mkimage-arch-pacman.conf -c -d -G -i $ROOTFS base haveged --ignore $PKGIGNORE

+	spawn pacstrap -C $PACMAN_CONF -c -d -G -i $ROOTFS base haveged $PACMAN_EXTRA_PKGS --ignore $PKGIGNORE

 	expect {

 		-exact "anyway? \[Y/n\] " { send -- "n\r"; exp_continue }

 		-exact "(default=all): " { send -- "\r"; exp_continue }

@@ -64,11 +93,11 @@ expect <<EOF

 EOF

 arch-chroot $ROOTFS /bin/sh -c 'rm -r /usr/share/man/*'

-arch-chroot $ROOTFS /bin/sh -c "haveged -w 1024; pacman-key --init; pkill haveged; pacman -Rs --noconfirm haveged; pacman-key --populate archlinux; pkill gpg-agent"

+arch-chroot $ROOTFS /bin/sh -c "haveged -w 1024; pacman-key --init; pkill haveged; pacman -Rs --noconfirm haveged; pacman-key --populate $ARCH_KEYRING; pkill gpg-agent"

 arch-chroot $ROOTFS /bin/sh -c "ln -s /usr/share/zoneinfo/UTC /etc/localtime"

 echo 'en_US.UTF-8 UTF-8' > $ROOTFS/etc/locale.gen

 arch-chroot $ROOTFS locale-gen

-arch-chroot $ROOTFS /bin/sh -c 'echo "Server = https://mirrors.kernel.org/archlinux/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist'

+arch-chroot $ROOTFS /bin/sh -c 'echo $PACMAN_MIRRORLIST > /etc/pacman.d/mirrorlist'

 # udev doesn't work in containers, rebuild /dev

 DEV=$ROOTFS/dev

@@ -88,6 +117,6 @@ mknod -m 600 $DEV/initctl p

 mknod -m 666 $DEV/ptmx c 5 2

 ln -sf /proc/self/fd $DEV/fd

-tar --numeric-owner --xattrs --acls -C $ROOTFS -c . | docker import - archlinux

-docker run --rm -t archlinux echo Success.

+tar --numeric-owner --xattrs --acls -C $ROOTFS -c . | docker import - $DOCKER_IMAGE_NAME

+docker run --rm -t $DOCKER_IMAGE_NAME echo Success.

 rm -rf $ROOTFS

new file mode 100644

@@ -0,0 +1,98 @@

+#

+# /etc/pacman.conf

+#

+# See the pacman.conf(5) manpage for option and repository directives

+

+#

+# 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

+#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

+Architecture = armv7h

+

+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup

+#IgnorePkg   =

+#IgnoreGroup =

+

+#NoUpgrade   =

+#NoExtract   =

+

+# Misc options

+#UseSyslog

+#Color

+#TotalDownload

+# We cannot check disk space from within a chroot environment

+#CheckSpace

+#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.

+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 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.

+#

+

+# 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]

+#Include = /etc/pacman.d/mirrorlist

+

+[core]

+Include = /etc/pacman.d/mirrorlist

+

+[extra]

+Include = /etc/pacman.d/mirrorlist

+

+#[community-testing]

+#Include = /etc/pacman.d/mirrorlist

+

+[community]

+Include = /etc/pacman.d/mirrorlist

+

+[alarm]

+Include = /etc/pacman.d/mirrorlist

+

+[aur]

+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

+