Merge pull request #3459 from Barthalion/master

Fix mkimage-arch.sh to generate cleaner Arch Linux images and do so with cleaner code

contrib/mkimage-arch-pacman.conf

@@ -0,0 +1,92 @@
+#
+# /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 = auto
+
+# 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
+
+# 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
+

contrib/mkimage-arch.sh

@@ -4,27 +4,25 @@
 # requires root
 set -e
 
-PACSTRAP=$(which pacstrap)
+hash pacstrap &>/dev/null || {
-[ "$PACSTRAP" ] || {
     echo "Could not find pacstrap. Run pacman -S arch-install-scripts"
     exit 1
 }
-EXPECT=$(which expect)
+
-[ "$EXPECT" ] || {
+hash expect &>/dev/null || {
     echo "Could not find expect. Run pacman -S expect"
     exit 1
 }
 
-ROOTFS=~/rootfs-arch-$$-$RANDOM
+ROOTFS=$(mktemp -d /tmp/rootfs-archlinux-XXXXXXXXXX)
-mkdir $ROOTFS
 
-#packages to ignore for space savings
+# packages to ignore for space savings
 PKGIGNORE=linux,jfsutils,lvm2,cryptsetup,groff,man-db,man-pages,mdadm,pciutils,pcmciautils,reiserfsprogs,s-nail,xfsprogs
- 
+
 expect <<EOF
   set timeout 60
   set send_slow {1 1}
-  spawn pacstrap -c -d -G -i $ROOTFS base haveged --ignore $PKGIGNORE
+  spawn pacstrap -C ./mkimage-arch-pacman.conf -c -d -G -i $ROOTFS base haveged --ignore $PKGIGNORE
   expect {
     "Install anyway?" { send n\r; exp_continue }
     "(default=all)" { send \r; exp_continue }
@@ -38,29 +36,26 @@ EOF
 
 arch-chroot $ROOTFS /bin/sh -c "haveged -w 1024; pacman-key --init; pkill haveged; pacman -Rs --noconfirm haveged; pacman-key --populate archlinux"
 arch-chroot $ROOTFS /bin/sh -c "ln -s /usr/share/zoneinfo/UTC /etc/localtime"
-cat > $ROOTFS/etc/locale.gen <<DELIM
+echo 'en_US.UTF-8 UTF-8' > $ROOTFS/etc/locale.gen
-en_US.UTF-8 UTF-8
-en_US ISO-8859-1
-DELIM
 arch-chroot $ROOTFS locale-gen
 arch-chroot $ROOTFS /bin/sh -c 'echo "Server = http://mirrors.kernel.org/archlinux/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist'
 
 # udev doesn't work in containers, rebuild /dev
-DEV=${ROOTFS}/dev
+DEV=$ROOTFS/dev
-mv ${DEV} ${DEV}.old
+rm -rf $DEV
-mkdir -p ${DEV}
+mkdir -p $DEV
-mknod -m 666 ${DEV}/null c 1 3
+mknod -m 666 $DEV/null c 1 3
-mknod -m 666 ${DEV}/zero c 1 5
+mknod -m 666 $DEV/zero c 1 5
-mknod -m 666 ${DEV}/random c 1 8
+mknod -m 666 $DEV/random c 1 8
-mknod -m 666 ${DEV}/urandom c 1 9
+mknod -m 666 $DEV/urandom c 1 9
-mkdir -m 755 ${DEV}/pts
+mkdir -m 755 $DEV/pts
-mkdir -m 1777 ${DEV}/shm
+mkdir -m 1777 $DEV/shm
-mknod -m 666 ${DEV}/tty c 5 0
+mknod -m 666 $DEV/tty c 5 0
-mknod -m 600 ${DEV}/console c 5 1
+mknod -m 600 $DEV/console c 5 1
-mknod -m 666 ${DEV}/tty0 c 4 0
+mknod -m 666 $DEV/tty0 c 4 0
-mknod -m 666 ${DEV}/full c 1 7
+mknod -m 666 $DEV/full c 1 7
-mknod -m 600 ${DEV}/initctl p
+mknod -m 600 $DEV/initctl p
-mknod -m 666 ${DEV}/ptmx c 5 2
+mknod -m 666 $DEV/ptmx c 5 2
 
 tar --numeric-owner -C $ROOTFS -c . | docker import - archlinux
 docker run -i -t archlinux echo Success.