From 1b6f378a86bf3cdfe41e097a5cec096f4a1dbd09 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Mon, 7 Aug 2017 16:01:30 +0200
Subject: Revert "Makefile: replace /var/run with /run"

When we are creating rpm, we install initscripts to chroot,
so the ROOT variable is set. And since we need that directory
in the package [1], we would have to create it in spec file
anyway.

[1] https://fedoraproject.org/wiki/Packaging:Tmpfiles.d

This reverts commit b119d37d1929a09e25bf288d0273aaaf8c7de86e.
---
 Makefile         | 10 +++-------
 initscripts.spec |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index a267f555..bc0af1e3 100644
--- a/Makefile
+++ b/Makefile
@@ -61,13 +61,9 @@ install:
 	make install ROOT=$(ROOT) mandir=$(mandir) -C src
 	make install PREFIX=$(ROOT) -C po
 
-	mkdir -p $(ROOT)/var/log
-	# do not touch /run if installing into a chroot
-	if -z "$(ROOT)"; then \
-	  mkdir -p /run/netreport; \
-	  chown $(SUPERUSER):$(SUPERGROUP) /run/netreport; \
-	  chmod u=rwx,g=rwx,o=rx /run/netreport; \
-	fi
+	mkdir -p $(ROOT)/run/netreport $(ROOT)/var/log
+	chown $(SUPERUSER):$(SUPERGROUP) $(ROOT)/run/netreport
+	chmod u=rwx,g=rwx,o=rx $(ROOT)/run/netreport
 
 	for i in 0 1 2 3 4 5 6 ; do \
 		dir=$(ROOT)/etc/rc.d/rc$$i.d; \
diff --git a/initscripts.spec b/initscripts.spec
index 4082b365..926dea1c 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -156,7 +156,7 @@ fi
 %{_prefix}/lib/udev/rename_device
 %{_sbindir}/service
 %{_mandir}/man*/*
-%dir %attr(775,root,root) /var/run/netreport
+%dir %attr(775,root,root) /run/netreport
 %dir %{_sysconfdir}/NetworkManager
 %dir %{_sysconfdir}/NetworkManager/dispatcher.d
 %{_sysconfdir}/NetworkManager/dispatcher.d/00-netreport
-- 
cgit v1.2.1