orion pushed to cobbler (epel7). "Create and own directories in tftp_dir"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue Apr 28 16:54:38 UTC 2015


>From 03cf87bccc69360aaeafaf379bbd9ab770b21853 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion at cora.nwra.com>
Date: Mon, 27 Apr 2015 15:47:41 -0600
Subject: Create and own directories in tftp_dir


diff --git a/cobbler.spec b/cobbler.spec
index 18dcf99..d4ee3a9 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -16,7 +16,7 @@ Name: cobbler
 License: GPLv2+
 AutoReq: no
 Version: 2.6.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: https://github.com/cobbler/cobbler/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -90,7 +90,8 @@ rm $RPM_BUILD_ROOT%{_sysconfdir}/cobbler/cobbler.conf
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
 mv $RPM_BUILD_ROOT%{_sysconfdir}/cobbler/cobblerd_rotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cobblerd
 
-mkdir -p $RPM_BUILD_ROOT%{tftp_dir}/images
+# Create data directories in tftp_dir
+mkdir -p $RPM_BUILD_ROOT%{tftp_dir}/{boot,etc,grub,images{,2},ppc,pxelinux.cfg,s390x}
 
 %if 0%{?rhel} == 6
 # sysvinit
@@ -189,7 +190,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %endif
 
 # data
-%{tftp_dir}/images
+%{tftp_dir}/*
 /var/www/cobbler
 %config(noreplace) /var/lib/cobbler
 %exclude /var/lib/cobbler/webui_sessions
@@ -269,6 +270,9 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/" /usr/share/cobbler/
 
 
 %changelog
+* Mon Apr 27 2015 Orion Poplawski <orion at cora.nwra.com> - 2.6.7-2
+- Create and own directories in tftp_dir
+
 * Wed Dec 31 2014 Orion Poplawski <orion at cora.nwra.com> - 2.6.7-1
 - Update to 2.6.7
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cobbler.git/commit/?h=epel7&id=03cf87bccc69360aaeafaf379bbd9ab770b21853


More information about the scm-commits mailing list