From b9d8bea6ec1e42c314f8628925d409bd65e9058a Mon Sep 17 00:00:00 2001
From: Michael Morrone <michael.morrone@onyxpoint.com>
Date: Fri, 12 Jul 2019 12:22:08 -0400
Subject: [PATCH] (SIMP-6828) Fix Secondary Environment for TFTP server (#131)

Contents of linux-install/centos-7-x86_64 should be world readable

SIMP-6828 #close
---
 build/rubygem-simp-cli.spec                   | 7 ++++++-
 lib/simp/cli/environment/secondary_dir_env.rb | 5 +++++
 lib/simp/cli/version.rb                       | 2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/build/rubygem-simp-cli.spec b/build/rubygem-simp-cli.spec
index 52ea538d..93c4c7c4 100644
--- a/build/rubygem-simp-cli.spec
+++ b/build/rubygem-simp-cli.spec
@@ -2,7 +2,7 @@
 
 %global gemdir /usr/share/simp/ruby
 %global geminstdir %{gemdir}/gems/%{gemname}-%{version}
-%global cli_version 5.0.0
+%global cli_version 5.0.1
 %global highline_version 1.7.8
 
 # gem2ruby's method of installing gems into mocked build roots will blow up
@@ -129,6 +129,11 @@ EOM
 %doc %{gemdir}/doc
 
 %changelog
+* Thu Jul 11 2019 Michael Morrone <michael.morrone@onyxpoint.com> - 5.0.1
+- Fixed a bug in which the tftpboot images copied into the rsync space in
+  SIMP's secondary environment were not world readable.  This prevented
+  clients from PXE booting.
+
 * Tue Jun 11 2019 Chris Tessmer <chris.tessmer@onyxpoint.com> - 5.0.0
 - Added 'simp environment' command
 - Added `simp environment new` subcommand
diff --git a/lib/simp/cli/environment/secondary_dir_env.rb b/lib/simp/cli/environment/secondary_dir_env.rb
index e9fd3830..e0a218c4 100644
--- a/lib/simp/cli/environment/secondary_dir_env.rb
+++ b/lib/simp/cli/environment/secondary_dir_env.rb
@@ -161,6 +161,11 @@ def copy_tftpboot_files
         dst_dirname = os_info.map(&:downcase).join('-')
         dst_path = File.join(@tftpboot_dest_path, dst_dirname)
         copy_skeleton_files(dir, dst_path, 'nobody')
+        # change perms to world readable or tftp fails
+        Dir.chdir(dst_path) do
+          FileUtils.chmod(0644, Dir.entries(dst_path) - %w[. ..])
+        end
+
 
         # create major OS version link
         os_info[1] = os_info[1].split('.').first
diff --git a/lib/simp/cli/version.rb b/lib/simp/cli/version.rb
index fe1601e0..cb8eb08e 100644
--- a/lib/simp/cli/version.rb
+++ b/lib/simp/cli/version.rb
@@ -1,5 +1,5 @@
 module Simp; end
 
 class Simp::Cli
-  VERSION = '5.0.0'
+  VERSION = '5.0.1'
 end