From 16be41c55fbb19c4449fa0b254d526cd11121367 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Tue, 4 Jun 2013 13:04:36 +0100
Subject: [PATCH] Fix Arch not properly upgrading it's system package.

---
 ChangeLog         | 5 +++++
 bootstrap-salt.sh | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 50e2564..b099840 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Version 1.5.6:
+	* Distro Support Fixed:
+		* Arch now upgrades it's system package properly as suggested on their mailing list.
+
+
 Version 1.5.5:
 	* Fixed a variable error in the new pre-seed feature.
 	* Fixed the destination path to where the pre-seed minions keys should be copied.
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 011d117..4657874 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -1945,6 +1945,12 @@ install_arch_linux_git_deps() {
 
 install_arch_linux_stable() {
     pacman -Sy --noconfirm pacman || return 1
+    # See https://mailman.archlinux.org/pipermail/arch-dev-public/2013-June/025043.html
+    # to know why we're ignoring below.
+    pacman -Syu --noconfirm --ignore filesystem,bash || return 1
+    pacman -S --noconfirm bash || return 1
+    pacman -Su --noconfirm || return 1
+    # We can now resume regular salt update
     pacman -Syu --noconfirm salt || return 1
     return 0
 }