From 520597485a50064f33eabfdf5ad76b9e8d329ede Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <tbehrens@outlook.com>
Date: Fri, 10 Apr 2020 07:20:17 -0400
Subject: [PATCH] Changed jail creation to always create base jails (#57)

---
 global.sh                | 4 ++--
 jails/jackett/install.sh | 1 -
 jails/lidarr/install.sh  | 3 +--
 jails/radarr/install.sh  | 3 +--
 jails/sonarr/install.sh  | 3 +--
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/global.sh b/global.sh
index d8cae689..13458a39 100755
--- a/global.sh
+++ b/global.sh
@@ -68,13 +68,13 @@ else
 	echo '{"pkgs":['${pkgs}']}' > /tmp/pkg.json
 	if [ "${setdhcp}" == "on" ]
 	then
-		if ! iocage create -n "${1}" -p /tmp/pkg.json -r ${global_jails_version} interfaces="${jailinterfaces}" dhcp="on" vnet="on" allow_raw_sockets="1" boot="on"
+		if ! iocage create -n "${1}" -p /tmp/pkg.json -r ${global_jails_version} interfaces="${jailinterfaces}" dhcp="on" vnet="on" allow_raw_sockets="1" boot="on" -b
 		then
 			echo "Failed to create jail"
 			exit 1
 		fi
 	else
-		if ! iocage create -n "${1}" -p /tmp/pkg.json -r ${global_jails_version} interfaces="${jailinterfaces}" ip4_addr="vnet0|${!jailip4}" defaultrouter="${!jailgateway}" vnet="on" allow_raw_sockets="1" boot="on"
+		if ! iocage create -n "${1}" -p /tmp/pkg.json -r ${global_jails_version} interfaces="${jailinterfaces}" ip4_addr="vnet0|${!jailip4}" defaultrouter="${!jailgateway}" vnet="on" allow_raw_sockets="1" boot="on" -b
 		then
 			echo "Failed to create jail"
 			exit 1
diff --git a/jails/jackett/install.sh b/jails/jackett/install.sh
index 3af8a978..60115ab8 100755
--- a/jails/jackett/install.sh
+++ b/jails/jackett/install.sh
@@ -1,7 +1,6 @@
 #!/usr/local/bin/bash
 # This file contains the install script for jackett
 
-iocage exec jackett ln -s /usr/local/bin/mono /usr/bin/mono
 iocage exec jackett "fetch https://github.com/Jackett/Jackett/releases/download/v0.11.502/Jackett.Binaries.Mono.tar.gz -o /usr/local/share"
 iocage exec jackett "tar -xzvf /usr/local/share/Jackett.Binaries.Mono.tar.gz -C /usr/local/share"
 iocage exec jackett rm /usr/local/share/Jackett.Binaries.Mono.tar.gz
diff --git a/jails/lidarr/install.sh b/jails/lidarr/install.sh
index 8fe19d76..f9308024 100755
--- a/jails/lidarr/install.sh
+++ b/jails/lidarr/install.sh
@@ -10,7 +10,6 @@ createmount lidarr ${global_dataset_media}
 createmount lidarr ${global_dataset_media}/music /mnt/music
 
 
-iocage exec lidarr ln -s /usr/local/bin/mono /usr/bin/mono
 iocage exec lidarr "fetch https://github.com/lidarr/Lidarr/releases/download/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz -o /usr/local/share"
 iocage exec lidarr "tar -xzvf /usr/local/share/Lidarr.develop.0.2.0.371.linux.tar.gz -C /usr/local/share"
 iocage exec lidarr "rm /usr/local/share/Lidarr.develop.0.2.0.371.linux.tar.gz"
@@ -20,4 +19,4 @@ iocage exec lidarr mkdir /usr/local/etc/rc.d
 cp ${SCRIPT_DIR}/jails/lidarr/includes/lidarr.rc /mnt/${global_dataset_iocage}/jails/lidarr/root/usr/local/etc/rc.d/lidarr
 iocage exec lidarr chmod u+x /usr/local/etc/rc.d/lidarr
 iocage exec lidarr sysrc "lidarr_enable=YES"
-iocage exec lidarr service lidarr start
\ No newline at end of file
+iocage exec lidarr service lidarr start
diff --git a/jails/radarr/install.sh b/jails/radarr/install.sh
index 1d71fb94..06e6e1f0 100755
--- a/jails/radarr/install.sh
+++ b/jails/radarr/install.sh
@@ -9,7 +9,6 @@ createmount radarr ${global_dataset_downloads}/complete /mnt/fetched
 createmount radarr ${global_dataset_media}
 createmount radarr ${global_dataset_media}/movies /mnt/movies
 
-iocage exec radarr ln -s /usr/local/bin/mono /usr/bin/mono
 iocage exec radarr "fetch https://github.com/Radarr/Radarr/releases/download/v0.2.0.1480/Radarr.develop.0.2.0.1480.linux.tar.gz -o /usr/local/share"
 iocage exec radarr "tar -xzvf /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz -C /usr/local/share"
 iocage exec radarr rm /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz
@@ -19,4 +18,4 @@ iocage exec radarr mkdir /usr/local/etc/rc.d
 cp ${SCRIPT_DIR}/jails/radarr/includes/radarr.rc /mnt/${global_dataset_iocage}/jails/radarr/root/usr/local/etc/rc.d/radarr
 iocage exec radarr chmod u+x /usr/local/etc/rc.d/radarr
 iocage exec radarr sysrc "radarr_enable=YES"
-iocage exec radarr service radarr restart
\ No newline at end of file
+iocage exec radarr service radarr restart
diff --git a/jails/sonarr/install.sh b/jails/sonarr/install.sh
index 7e28487a..ccc2048e 100755
--- a/jails/sonarr/install.sh
+++ b/jails/sonarr/install.sh
@@ -9,7 +9,6 @@ createmount sonarr ${global_dataset_downloads}/complete /mnt/fetched
 createmount sonarr ${global_dataset_media}
 createmount sonarr ${global_dataset_media}/shows /mnt/shows
 
-iocage exec sonarr ln -s /usr/local/bin/mono /usr/bin/mono
 iocage exec sonarr "fetch http://download.sonarr.tv/v2/master/mono/NzbDrone.master.tar.gz -o /usr/local/share"
 iocage exec sonarr "tar -xzvf /usr/local/share/NzbDrone.master.tar.gz -C /usr/local/share"
 iocage exec sonarr rm /usr/local/share/NzbDrone.master.tar.gz
@@ -19,4 +18,4 @@ iocage exec sonarr mkdir /usr/local/etc/rc.d
 cp ${SCRIPT_DIR}/jails/sonarr/includes/sonarr.rc /mnt/${global_dataset_iocage}/jails/sonarr/root/usr/local/etc/rc.d/sonarr
 iocage exec sonarr chmod u+x /usr/local/etc/rc.d/sonarr
 iocage exec sonarr sysrc "sonarr_enable=YES"
-iocage exec sonarr service sonarr restart
\ No newline at end of file
+iocage exec sonarr service sonarr restart