From 906c5293dd7a9f582a36d235e0b13887a861999a Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 21 Sep 2018 12:37:54 +0200
Subject: [*] Preparations for new iPXE (mtools, mkdir)

---
 satellit_installer/includes/00-variables.inc                 | 2 +-
 satellit_installer/includes/90-set_directory_permissions.inc | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'satellit_installer')

diff --git a/satellit_installer/includes/00-variables.inc b/satellit_installer/includes/00-variables.inc
index 20e4b1d..61c2a5f 100644
--- a/satellit_installer/includes/00-variables.inc
+++ b/satellit_installer/includes/00-variables.inc
@@ -26,7 +26,7 @@ PACKAGELIST_SERVER="
 	sudo php-common php-mysqlnd php-cli nfs-kernel-server curl
 	nfs-common libowfat0 ldap-utils vim gcc make unattended-upgrades gnupg
 	libowfat-dev libssl-dev gcc make liblzma-dev tftpd-hpa tmate php-xml net-tools
-	libjansson4 php-soap
+	libjansson4 php-soap mtools
 "
 
 # Enter here packages needing installation of recommended packages as determines by apt-get:
diff --git a/satellit_installer/includes/90-set_directory_permissions.inc b/satellit_installer/includes/90-set_directory_permissions.inc
index f40322b..2bb977b 100644
--- a/satellit_installer/includes/90-set_directory_permissions.inc
+++ b/satellit_installer/includes/90-set_directory_permissions.inc
@@ -29,9 +29,9 @@ set_directory_permissions() {
 	chmod 755 "$WWWDIR" 2>/dev/null			# if already there
 	chown -R www-data:taskmanager "$WWWDIR"
 
-	mkdir -p "$WWWDIR/boot"
-	chown -R taskmanager:www-data "$WWWDIR"/boot 2>/dev/null
-	chmod 755 "$WWWDIR"/boot 2>/dev/null
+	mkdir -p "$WWWDIR/boot/download"
+	chown -R taskmanager:www-data "$WWWDIR/boot"
+	chmod 755 "$WWWDIR/boot" "$WWWDIR/boot/download"
 
 	chown -R taskmanager: "$TFTPDIR"
 
-- 
cgit v1.2.3-55-g7522