From 58fb7000b13166d0b8fce30fe52bfbf268cb4e8a Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Wed, 30 Mar 2016 16:58:04 +0900 Subject: [PATCH] dist: add setup scripts symlink to /usr/sbin Instead of moving script to /usr/sbin, create symlink from /usr/lib/scylla/scylla_*setup to /usr/sbin/ Fixes #1092 Signed-off-by: Takuya ASADA Message-Id: <1459324684-31364-1-git-send-email-syuu@scylladb.com> --- dist/common/sbin/scylla_bootparam_setup | 1 + dist/common/sbin/scylla_coredump_setup | 1 + dist/common/sbin/scylla_io_setup | 1 + dist/common/sbin/scylla_ntp_setup | 1 + dist/common/sbin/scylla_raid_setup | 1 + dist/common/sbin/scylla_selinux_setup | 1 + dist/common/sbin/scylla_setup | 1 + dist/common/sbin/scylla_sysconfig_setup | 1 + dist/redhat/scylla-server.spec.in | 3 +++ dist/ubuntu/rules.in | 5 +++++ 10 files changed, 16 insertions(+) create mode 120000 dist/common/sbin/scylla_bootparam_setup create mode 120000 dist/common/sbin/scylla_coredump_setup create mode 120000 dist/common/sbin/scylla_io_setup create mode 120000 dist/common/sbin/scylla_ntp_setup create mode 120000 dist/common/sbin/scylla_raid_setup create mode 120000 dist/common/sbin/scylla_selinux_setup create mode 120000 dist/common/sbin/scylla_setup create mode 120000 dist/common/sbin/scylla_sysconfig_setup diff --git a/dist/common/sbin/scylla_bootparam_setup b/dist/common/sbin/scylla_bootparam_setup new file mode 120000 index 0000000000..26f5fe6189 --- /dev/null +++ b/dist/common/sbin/scylla_bootparam_setup @@ -0,0 +1 @@ +/usr/lib/scylla/scylla_bootparam_setup \ No newline at end of file diff --git a/dist/common/sbin/scylla_coredump_setup b/dist/common/sbin/scylla_coredump_setup new file mode 120000 index 0000000000..1adce21ea7 --- /dev/null +++ b/dist/common/sbin/scylla_coredump_setup @@ -0,0 +1 @@ +/usr/lib/scylla/scylla_coredump_setup \ No newline at end of file diff --git a/dist/common/sbin/scylla_io_setup b/dist/common/sbin/scylla_io_setup new file mode 120000 index 0000000000..e42d21e83d --- /dev/null +++ b/dist/common/sbin/scylla_io_setup @@ -0,0 +1 @@ +/usr/lib/scylla/scylla_io_setup \ No newline at end of file diff --git a/dist/common/sbin/scylla_ntp_setup b/dist/common/sbin/scylla_ntp_setup new file mode 120000 index 0000000000..29d87d6a59 --- /dev/null +++ b/dist/common/sbin/scylla_ntp_setup @@ -0,0 +1 @@ +/usr/lib/scylla/scylla_ntp_setup \ No newline at end of file diff --git a/dist/common/sbin/scylla_raid_setup b/dist/common/sbin/scylla_raid_setup new file mode 120000 index 0000000000..9dcada2337 --- /dev/null +++ b/dist/common/sbin/scylla_raid_setup @@ -0,0 +1 @@ +/usr/lib/scylla/scylla_raid_setup \ No newline at end of file diff --git a/dist/common/sbin/scylla_selinux_setup b/dist/common/sbin/scylla_selinux_setup new file mode 120000 index 0000000000..31931f0518 --- /dev/null +++ b/dist/common/sbin/scylla_selinux_setup @@ -0,0 +1 @@ +/usr/lib/scylla/scylla_selinux_setup \ No newline at end of file diff --git a/dist/common/sbin/scylla_setup b/dist/common/sbin/scylla_setup new file mode 120000 index 0000000000..a211a72c43 --- /dev/null +++ b/dist/common/sbin/scylla_setup @@ -0,0 +1 @@ +/usr/lib/scylla/scylla_setup \ No newline at end of file diff --git a/dist/common/sbin/scylla_sysconfig_setup b/dist/common/sbin/scylla_sysconfig_setup new file mode 120000 index 0000000000..3d961a36b9 --- /dev/null +++ b/dist/common/sbin/scylla_sysconfig_setup @@ -0,0 +1 @@ +/usr/lib/scylla/scylla_sysconfig_setup \ No newline at end of file diff --git a/dist/redhat/scylla-server.spec.in b/dist/redhat/scylla-server.spec.in index a8caf4f729..6c33f69866 100644 --- a/dist/redhat/scylla-server.spec.in +++ b/dist/redhat/scylla-server.spec.in @@ -36,6 +36,7 @@ ninja-build %{?_smp_mflags} build/release/scylla build/release/iotune %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} +mkdir -p $RPM_BUILD_ROOT%{_sbindir} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/limits.d/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sudoers.d/ @@ -77,6 +78,7 @@ cp -r swagger-ui/dist $RPM_BUILD_ROOT%{_prefix}/lib/scylla/swagger-ui install -d -m755 $RPM_BUILD_ROOT%{_prefix}/lib/scylla/api cp -r api/api-doc $RPM_BUILD_ROOT%{_prefix}/lib/scylla/api cp -r tools/scyllatop $RPM_BUILD_ROOT%{_prefix}/lib/scylla/scyllatop +install -m755 dist/common/sbin/* $RPM_BUILD_ROOT%{_sbindir}/ %pre /usr/sbin/groupadd scylla 2> /dev/null || : @@ -152,6 +154,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/scylla %{_bindir}/iotune %{_bindir}/scyllatop +%{_sbindir}/scylla* %{_prefix}/lib/scylla/scylla_prepare %{_prefix}/lib/scylla/scylla_stop %{_prefix}/lib/scylla/scylla_setup diff --git a/dist/ubuntu/rules.in b/dist/ubuntu/rules.in index dc1b823389..16153eaa74 100755 --- a/dist/ubuntu/rules.in +++ b/dist/ubuntu/rules.in @@ -68,6 +68,11 @@ override_dh_auto_install: cp $(CURDIR)/dist/common/bin/scyllatop \ $(CURDIR)/debian/scylla-server/usr/bin/ + mkdir -p $(CURDIR)/debian/scylla-server/usr/sbin/ && \ + cp $(CURDIR)/dist/common/sbin/* \ + $(CURDIR)/debian/scylla-server/usr/sbin/ + + mkdir -p $(CURDIR)/debian/scylla-server/var/lib/scylla/data mkdir -p $(CURDIR)/debian/scylla-server/var/lib/scylla/commitlog mkdir -p $(CURDIR)/debian/scylla-server/var/lib/scylla/coredump