aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Nykryn <lnykryn@redhat.com>2015-05-07 13:51:20 +0200
committerLukas Nykryn <lnykryn@redhat.com>2015-05-07 13:59:31 +0200
commitf80e1a89366760c7133c7c923dd3cede46fc7543 (patch)
treec2f9618a8aa884d76a156cd23286a864a833d1a9
parente3784a1aefb3f38a5a3f9ae69b3feff9c8ef5610 (diff)
downloadinitscripts-f80e1a89366760c7133c7c923dd3cede46fc7543.tar
initscripts-f80e1a89366760c7133c7c923dd3cede46fc7543.tar.gz
initscripts-f80e1a89366760c7133c7c923dd3cede46fc7543.tar.bz2
initscripts-f80e1a89366760c7133c7c923dd3cede46fc7543.tar.xz
initscripts-f80e1a89366760c7133c7c923dd3cede46fc7543.zip
brandbot: move to /usr/libexec/initscripts
-rw-r--r--initscripts.spec2
-rw-r--r--src/Makefile4
-rw-r--r--systemd/system/brandbot.service2
3 files changed, 4 insertions, 4 deletions
diff --git a/initscripts.spec b/initscripts.spec
index 4b47b705..caa6a5f5 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -120,7 +120,7 @@ rm -rf $RPM_BUILD_ROOT
/etc/sysconfig/network-scripts/ifdown-post
/etc/sysconfig/network-scripts/ifup
/usr/sbin/ifup
-/usr/sbin/brandbot
+/usr/libexec/initscripts/brandbot
%dir /etc/sysconfig/console
%dir /etc/sysconfig/modules
/etc/sysconfig/network-scripts/network-functions
diff --git a/src/Makefile b/src/Makefile
index 76f340fc..993dfa9c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -20,7 +20,7 @@ clean:
rm -f $(PROGS) *.o *~
install:
- mkdir -p $(ROOT)/usr/bin $(ROOT)/usr/sbin $(ROOT)$(mandir)/man{1,8} $(ROOT)/etc $(ROOT)/usr/lib/udev
+ mkdir -p $(ROOT)/usr/bin $(ROOT)/usr/sbin $(ROOT)$(mandir)/man{1,8} $(ROOT)/etc $(ROOT)/usr/lib/udev $(ROOT)/usr/libexec/initscripts/
install -m 755 usleep $(ROOT)/usr/bin/usleep
install -m 4755 usernetctl $(ROOT)/usr/sbin/usernetctl
install -m 2755 netreport $(ROOT)/usr/sbin/netreport
@@ -29,7 +29,7 @@ install:
install -m 755 ppp-watch $(ROOT)/usr/sbin/ppp-watch
install -m 755 consoletype $(ROOT)/usr/sbin/consoletype
install -m 755 sushell $(ROOT)/usr/sbin/sushell
- install -m 755 brandbot $(ROOT)/usr/sbin/brandbot
+ install -m 755 brandbot $(ROOT)/usr/libexec/initscripts/brandbot
install -m 755 rename_device $(ROOT)/usr/lib/udev/rename_device
install -m 755 udev-kvm-check $(ROOT)/usr/lib/udev/udev-kvm-check
install -m 644 genhostid.1 $(ROOT)$(mandir)/man1
diff --git a/systemd/system/brandbot.service b/systemd/system/brandbot.service
index 9b421b69..eeef9423 100644
--- a/systemd/system/brandbot.service
+++ b/systemd/system/brandbot.service
@@ -2,5 +2,5 @@
Description=Flexible Branding Service
[Service]
-ExecStart=/usr/sbin/brandbot
+ExecStart=/usr/libexec/initscripts/brandbot
PrivateTmp=true