From d6d8b36d8ea123aad027a4969d34ed4f36779c21 Mon Sep 17 00:00:00 2001
From: Christian Stadelmann <dev@genodeftest.de>
Date: Fri, 4 Nov 2016 19:26:54 +0100
Subject: [PATCH 1/3] Fedora uses yum instead of dnf now (#740)

Fully adapt this script to using dnf instead of yum on Fedora.
---
 bootstrap.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 9e4ab82..9d6026d 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -134,19 +134,19 @@ fedora()
 	echo "Detected Fedora"
 	if [ -z "$(which git)" ]; then
 		echo "Installing git..."
-		sudo yum install git-all
+		sudo dnf install git-all
 	fi
 	if [ "$1" == "qemu" ]; then
 		if [ -z "$(which qemu-system-i386)" ]; then
 			echo "Installing QEMU..."
-			sudo yum install qemu-system-x86 qemu-kvm
+			sudo dnf install qemu-system-x86 qemu-kvm
 		else
 			echo "QEMU already installed!"
 		fi
 	else
 		if [ -z "$(which virtualbox)" ]; then
 			echo "Installing virtualbox..."
-			sudo yum install virtualbox
+			sudo dnf install virtualbox
 		else
 			echo "Virtualbox already installed!"
 		fi
@@ -439,7 +439,7 @@ else
 		ubuntu "$emulator" "$defpackman"
 	fi
 	# Fedora
-	if hash 2>/dev/null yum; then
+	if hash 2>/dev/null dnf; then
 		fedora "$emulator"
 	fi
 	# Suse and derivatives

From 03f989b2c2b3c7d355c4c2c80c0d5721890f8664 Mon Sep 17 00:00:00 2001
From: Christian Stadelmann <dev@genodeftest.de>
Date: Fri, 4 Nov 2016 19:46:38 +0100
Subject: [PATCH 2/3] bootstrap.sh: Fix naming origin (#742)

In line 386, origin is named "upstream", but in line 408 it was called "origin".
---
 bootstrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 9d6026d..5782775 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -405,7 +405,7 @@ boot()
 if [ "$1" == "-h" ]; then
 	usage
 elif [ "$1" == "-u" ]; then
-	git pull origin master
+	git pull upstream master
 	git submodule update --recursive --init
 	rustup update nightly
 	exit

From 92d9658a74fc9a5ce5a94a75ce540ce28f11ed7b Mon Sep 17 00:00:00 2001
From: Christian Stadelmann <dev@genodeftest.de>
Date: Fri, 4 Nov 2016 19:47:06 +0100
Subject: [PATCH 3/3] bootstrap.sh: Fix typo (#741)

Fix minor typo
---
 bootstrap.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 5782775..fb4bf0e 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -134,19 +134,19 @@ fedora()
 	echo "Detected Fedora"
 	if [ -z "$(which git)" ]; then
 		echo "Installing git..."
-		sudo dnf install git-all
+		sudo yum install git-all
 	fi
 	if [ "$1" == "qemu" ]; then
 		if [ -z "$(which qemu-system-i386)" ]; then
 			echo "Installing QEMU..."
-			sudo dnf install qemu-system-x86 qemu-kvm
+			sudo yum install qemu-system-x86 qemu-kvm
 		else
 			echo "QEMU already installed!"
 		fi
 	else
 		if [ -z "$(which virtualbox)" ]; then
 			echo "Installing virtualbox..."
-			sudo dnf install virtualbox
+			sudo yum install virtualbox
 		else
 			echo "Virtualbox already installed!"
 		fi
@@ -282,7 +282,7 @@ usage()
 ####################################################################################
 rustInstall() {
 	# Check to see if multirust is installed, we don't want it messing with rustup
-	# In th future we can probably remove this but I believe it's good to have for now	
+	# In the future we can probably remove this but I believe it's good to have for now
 	if [ -e /usr/local/lib/rustlib/uninstall.sh ] ; then
 		echo "It appears that multirust is installed on your system."
 		echo "This tool has been deprecated by the maintainer, and will cause issues."
@@ -439,7 +439,7 @@ else
 		ubuntu "$emulator" "$defpackman"
 	fi
 	# Fedora
-	if hash 2>/dev/null dnf; then
+	if hash 2>/dev/null yum; then
 		fedora "$emulator"
 	fi
 	# Suse and derivatives