From b15a3fe905cb39f42abb58d4d9ecb9e8da622bda Mon Sep 17 00:00:00 2001
From: Ludovic Chabant <ludovic@chabant.com>
Date: Sun, 17 Feb 2019 06:15:36 +0000
Subject: [PATCH] Add mercurial package to some build runner images

---
 images/alpine/functions    | 2 ++
 images/alpine/genimg       | 2 +-
 images/archlinux/functions | 2 ++
 images/archlinux/genimg    | 2 +-
 images/debian/functions    | 2 ++
 images/debian/genimg       | 2 +-
 images/fedora/functions    | 2 ++
 images/fedora/genimg       | 2 +-
 images/ubuntu/functions    | 2 ++
 images/ubuntu/genimg       | 2 +-
 10 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/images/alpine/functions b/images/alpine/functions
index 0c03d42..eda4a78 100644
--- a/images/alpine/functions
+++ b/images/alpine/functions
@@ -54,6 +54,8 @@ sanity_check() {
 	guest_ssh -p 8022 build@localhost sudo apk add htop
 	echo "Testing git..."
 	guest_ssh -p 8022 build@localhost git --version
+	echo "Testing mercurial..."
+	guest_ssh -p 8022 build@localhost hg --version
 	echo "Everything works!"
 	guest_ssh -p 8022 build@localhost sudo poweroff || true
 }
diff --git a/images/alpine/genimg b/images/alpine/genimg
index 44a363a..c98f3ec 100755
--- a/images/alpine/genimg
+++ b/images/alpine/genimg
@@ -50,7 +50,7 @@ apk add -U -X http://dl-cdn.alpinelinux.org/alpine/$release/main/ \
 	--arch="$arch" \
 	--root=/mnt \
 	--initdb \
-	acct alpine-base alpine-conf alpine-sdk linux-vanilla git openssh \
+	acct alpine-base alpine-conf alpine-sdk linux-vanilla git mercurial openssh \
 	sudo syslinux tzdata gnupg haveged bash
 
 mount --bind /dev /mnt/dev
diff --git a/images/archlinux/functions b/images/archlinux/functions
index 513e03e..b1657cb 100644
--- a/images/archlinux/functions
+++ b/images/archlinux/functions
@@ -46,6 +46,8 @@ sanity_check() {
 	guest_ssh -p 8022 build@localhost sudo pacman -Syu --noconfirm
 	echo "Testing git..."
 	guest_ssh -p 8022 build@localhost git --version
+	echo "Testing mercurial..."
+	guest_ssh -p 8022 build@localhost hg --version
 	echo "Testing AUR packages..."
 	install 8022 brightnessctl
 	echo "Everything works!"
diff --git a/images/archlinux/genimg b/images/archlinux/genimg
index 2786421..cdef8e8 100755
--- a/images/archlinux/genimg
+++ b/images/archlinux/genimg
@@ -20,7 +20,7 @@ mkdir -p "$root"
 mkfs.ext4 /dev/nbd0
 mount /dev/nbd0 "$root"
 
-pacstrap root base base-devel git openssh
+pacstrap root base base-devel git mercurial openssh
 
 run_root() {
     local cmd="$@"
diff --git a/images/debian/functions b/images/debian/functions
index 6af82fe..e6eca4d 100644
--- a/images/debian/functions
+++ b/images/debian/functions
@@ -67,6 +67,8 @@ sanity_check() {
 	guest_ssh -p 8022 build@localhost curl https://example.org
 	echo "Testing git..."
 	guest_ssh -p 8022 build@localhost git --version
+	echo "Testing mercurial..."
+	guest_ssh -p 8022 build@localhost hg --version
 	echo "Everything works!"
 	guest_ssh -p 8022 build@localhost sudo systemctl poweroff || true
 }
diff --git a/images/debian/genimg b/images/debian/genimg
index d2c6040..d016103 100755
--- a/images/debian/genimg
+++ b/images/debian/genimg
@@ -99,7 +99,7 @@ run_root apt-get update
 run_root apt-get -y install locales
 run_root apt-get -y install linux-image-$arch
 run_root apt-get -y install \
-	build-essential git ssh sudo dirmngr apt-transport-https extlinux
+	build-essential git mercurial ssh sudo dirmngr apt-transport-https extlinux
 
 if [ "$arch" = "amd64" ]
 then
diff --git a/images/fedora/functions b/images/fedora/functions
index 36b0b92..a555ef5 100644
--- a/images/fedora/functions
+++ b/images/fedora/functions
@@ -42,6 +42,8 @@ sanity_check() {
 	guest_ssh -p 8022 build@localhost sudo dnf -y install htop
 	echo "Testing git..."
 	guest_ssh -p 8022 build@localhost git --version
+	echo "Testing mercurial..."
+	guest_ssh -p 8022 build@localhost hg --version
 	echo "Everything works!"
 	guest_ssh -p 8022 build@localhost sudo systemctl poweroff || true
 }
diff --git a/images/fedora/genimg b/images/fedora/genimg
index 200272a..d9919cd 100755
--- a/images/fedora/genimg
+++ b/images/fedora/genimg
@@ -85,7 +85,7 @@ run_root systemctl enable systemd-networkd.service
 run_root systemctl enable systemd-timesyncd.service
 
 run_root dnf -y install kernel
-run_root dnf -y install @development-tools git openssh-server sudo \
+run_root dnf -y install @development-tools git mercurial openssh-server sudo \
 	syslinux syslinux-extlinux
 
 if [ "$arch" = "x86_64" ]
diff --git a/images/ubuntu/functions b/images/ubuntu/functions
index 6af82fe..e6eca4d 100644
--- a/images/ubuntu/functions
+++ b/images/ubuntu/functions
@@ -67,6 +67,8 @@ sanity_check() {
 	guest_ssh -p 8022 build@localhost curl https://example.org
 	echo "Testing git..."
 	guest_ssh -p 8022 build@localhost git --version
+	echo "Testing mercurial..."
+	guest_ssh -p 8022 build@localhost hg --version
 	echo "Everything works!"
 	guest_ssh -p 8022 build@localhost sudo systemctl poweroff || true
 }
diff --git a/images/ubuntu/genimg b/images/ubuntu/genimg
index 8eb3cd8..6c248c7 100755
--- a/images/ubuntu/genimg
+++ b/images/ubuntu/genimg
@@ -107,7 +107,7 @@ run_root apt-get update
 run_root apt-get -y install locales
 run_root apt-get -y install linux-image-generic
 run_root apt-get -y install \
-	build-essential git ssh sudo dirmngr
+	build-essential git mercurial ssh sudo dirmngr
 
 if [ "$arch" = "amd64" ]
 then
-- 
2.38.5