diff --git a/.gitignore b/.gitignore index b501bc38..3d12f6e1 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,16 @@ /*.rpm /.cache /build +/debian/*.debhelper +/debian/*.debhelper.log +/debian/*.substvars +/debian/.* /debian/changelog +/debian/debhelper* +/debian/files +/debian/grout-dev/ +/debian/grout/ +/debian/tmp/ /redhat-linux-build /subprojects/dpdk /subprojects/ecoli diff --git a/Containerfile b/Containerfile index f05144b3..79650be6 100644 --- a/Containerfile +++ b/Containerfile @@ -7,4 +7,4 @@ RUN rm -f /tmp/grout-debug*.rpm RUN dnf -y install --nodocs --setopt=install_weak_deps=0 /tmp/grout*.rpm RUN dnf -y --enablerepo='*' clean all RUN rm -f /tmp/grout*.rpm -CMD ["/usr/sbin/grout"] +CMD ["/usr/bin/grout"] diff --git a/README.md b/README.md index 434c96a4..a25f9e94 100644 --- a/README.md +++ b/README.md @@ -119,7 +119,7 @@ systemctl restart grout.service Memory: 6.6M CPU: 19.185s CGroup: /system.slice/grout.service - └─31299 /usr/sbin/grout + └─31299 /usr/bin/grout Nov 30 10:31:31 grout systemd[1]: Starting Graph router daemon... Nov 30 10:31:31 grout grout[31299]: GROUT: main: starting grout version v0.2-93-gf53240e3750a diff --git a/debian/.gitignore b/debian/.gitignore deleted file mode 100644 index 62514e8a..00000000 --- a/debian/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -.* diff --git a/debian/grout.install b/debian/grout.install index 5ccfc0d3..033c8531 100644 --- a/debian/grout.install +++ b/debian/grout.install @@ -1,6 +1,6 @@ /etc/default/grout /etc/grout.init /usr/bin/grcli -/usr/sbin/grout +/usr/bin/grout /usr/share/man/man1/grcli.1 /usr/share/man/man8/grout.8 diff --git a/main/grout.service b/main/grout.service index ea02a1fc..5bb04e17 100644 --- a/main/grout.service +++ b/main/grout.service @@ -11,7 +11,7 @@ Type=notify Restart=on-failure EnvironmentFile=-/etc/default/grout ExecStartPre=/usr/bin/udevadm settle -ExecStart=/usr/sbin/grout $GROUT_OPTS +ExecStart=/usr/bin/grout $GROUT_OPTS ExecStartPost=/usr/bin/grcli -xef /etc/grout.init [Install] diff --git a/meson.build b/meson.build index e2c55022..236e9d58 100644 --- a/meson.build +++ b/meson.build @@ -97,7 +97,6 @@ grout_exe = executable( dependencies: [dpdk_dep, ev_core_dep, ev_thread_dep, numa_dep], c_args: ['-D__GROUT_MAIN__'], install: true, - install_dir: 'sbin', ) grcli_exe = executable( diff --git a/rpm/grout.spec b/rpm/grout.spec index 5e8dfcdc..1ca11fc2 100644 --- a/rpm/grout.spec +++ b/rpm/grout.spec @@ -88,7 +88,7 @@ rm -rf %{buildroot} %{_vpath_builddir} %attr(644, root, root) %{_datadir}/bash-completion/completions/grout %attr(644, root, root) %{_datadir}/bash-completion/completions/grcli %attr(755, root, root) %{_bindir}/grcli -%attr(755, root, root) %{_sbindir}/grout +%attr(755, root, root) %{_bindir}/grout %attr(644, root, root) %{_mandir}/man1/grcli.1* %attr(644, root, root) %{_mandir}/man8/grout.8*