github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix files/dirs permissions

Browse Source 
- change modes to proper values
- replace 'mkdir' with 'install'
- remove unused files and dirs

Signed-off-by: Rafal Stefanowski <rafal.stefanowski@intel.com>
This commit is contained in:
Rafal Stefanowski 2022-03-21 15:37:16 +01:00
parent b14bf05ff8
commit cb8d1cffae
5 changed files with 24 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -30,10 +30,10 @@ archives:
@tools/pckgen $(PWD) tar zip @tools/pckgen $(PWD) tar zip
rpm: rpm:
@tools/pckgen $(PWD) rpm --debug @tools/pckgen $(PWD) rpm
srpm: srpm:
@tools/pckgen $(PWD) srpm --debug @tools/pckgen $(PWD) srpm
deb: deb:
@tools/pckgen $(PWD) deb @tools/pckgen $(PWD) deb

9
casadm/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright(c) 2012-2021 Intel Corporation # Copyright(c) 2012-2022 Intel Corporation
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
@ -132,11 +132,8 @@ install: install_files
install_files: install_files:
@echo "Installing casadm" @echo "Installing casadm"
@mkdir -p $(DESTDIR)$(BINARY_PATH) @install -m 755 -D $(TARGET) $(DESTDIR)$(BINARY_PATH)/$(TARGET)
@install -m 755 $(TARGET) $(DESTDIR)$(BINARY_PATH)/$(TARGET) @install -m 644 -D $(TARGET).8 $(DESTDIR)/usr/share/man/man8/$(TARGET).8
@mkdir -p $(DESTDIR)/usr/share/man/man8
@install -m 644 $(TARGET).8 $(DESTDIR)/usr/share/man/man8/$(TARGET).8
@mkdir -p $(DESTDIR)/usr/share/man/man5
uninstall: uninstall:
@echo "Uninstalling casadm" @echo "Uninstalling casadm"

7
modules/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright(c) 2012-2021 Intel Corporation # Copyright(c) 2012-2022 Intel Corporation
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
# If $(M) is defined, we've been invoked from the # If $(M) is defined, we've been invoked from the
@ -58,9 +58,8 @@ install: install_files
install_files: install_files:
@echo "Installing Open-CAS modules" @echo "Installing Open-CAS modules"
@install -m 755 -d $(DESTDIR)$(MODULES_DIR) @install -m 644 -D cas_disk/$(DISK_MODULE).ko $(DESTDIR)$(MODULES_DIR)/$(DISK_MODULE).ko
@install -m 744 cas_disk/$(DISK_MODULE).ko $(DESTDIR)$(MODULES_DIR)/$(DISK_MODULE).ko @install -m 644 -D cas_cache/$(CACHE_MODULE).ko $(DESTDIR)$(MODULES_DIR)/$(CACHE_MODULE).ko
@install -m 744 cas_cache/$(CACHE_MODULE).ko $(DESTDIR)$(MODULES_DIR)/$(CACHE_MODULE).ko
uninstall: uninstall:
@echo "Uninstalling Open-CAS modules" @echo "Uninstalling Open-CAS modules"

43
utils/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright(c) 2012-2021 Intel Corporation # Copyright(c) 2012-2022 Intel Corporation
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
@ -34,39 +34,28 @@ else
install_files: install_files:
@echo "Installing Open-CAS utils" @echo "Installing Open-CAS utils"
@install -m 755 -d $(DESTDIR)/etc/opencas @install -m 644 -D $(UTILS_DIR)/opencas.conf $(DESTDIR)/etc/opencas/opencas.conf
@install -m 644 $(UTILS_DIR)/opencas.conf $(DESTDIR)/etc/opencas/opencas.conf @install -m 644 -D $(UTILS_DIR)/ioclass-config.csv $(DESTDIR)/etc/opencas/ioclass-config.csv
@install -m 444 $(UTILS_DIR)/ioclass-config.csv $(DESTDIR)/etc/opencas/ioclass-config.csv @install -m 644 -D $(METADATA_DIR)/cas_version $(DESTDIR)/var/lib/opencas/cas_version
@install -m 755 -d $(DESTDIR)/var/lib/opencas @install -m 644 -D $(UTILS_DIR)/opencas.conf.5 $(DESTDIR)/usr/share/man/man5/opencas.conf.5
@install -m 644 $(METADATA_DIR)/cas_version $(DESTDIR)/var/lib/opencas/cas_version
@mkdir -p $(DESTDIR)/usr/share/man/man5
@install -m 644 $(UTILS_DIR)/opencas.conf.5 $(DESTDIR)/usr/share/man/man5/opencas.conf.5
@install -m 755 -d $(DESTDIR)$(CASCTL_DIR) @install -m 644 -D opencas.py $(DESTDIR)$(CASCTL_DIR)/opencas.py
@install -m 644 opencas.py $(DESTDIR)$(CASCTL_DIR)/opencas.py @install -m 755 -D casctl $(DESTDIR)$(CASCTL_DIR)/casctl
@install -m 755 casctl $(DESTDIR)$(CASCTL_DIR)/casctl @install -m 755 -D open-cas-loader $(DESTDIR)$(CASCTL_DIR)/open-cas-loader
@install -m 755 open-cas-loader $(DESTDIR)$(CASCTL_DIR)/open-cas-loader
@mkdir -p $(DESTDIR)/etc/dracut.conf.d/ @install -m 644 -D etc/dracut.conf.d/opencas.conf $(DESTDIR)/etc/dracut.conf.d/opencas.conf
@install -m 644 etc/dracut.conf.d/opencas.conf $(DESTDIR)/etc/dracut.conf.d/opencas.conf
@mkdir -p $(DESTDIR)/sbin @install -m 755 -d $(DESTDIR)/sbin
@ln -fs $(CASCTL_DIR)/casctl $(DESTDIR)/sbin/casctl @ln -fs $(CASCTL_DIR)/casctl $(DESTDIR)/sbin/casctl
@mkdir -p $(DESTDIR)$(UDEVRULES_DIR) @install -m 644 -D 60-persistent-storage-cas-load.rules $(DESTDIR)$(UDEVRULES_DIR)/60-persistent-storage-cas-load.rules
@install -m 644 60-persistent-storage-cas-load.rules $(DESTDIR)$(UDEVRULES_DIR)/60-persistent-storage-cas-load.rules @install -m 644 -D 60-persistent-storage-cas.rules $(DESTDIR)$(UDEVRULES_DIR)/60-persistent-storage-cas.rules
@install -m 644 60-persistent-storage-cas.rules $(DESTDIR)$(UDEVRULES_DIR)/60-persistent-storage-cas.rules
@install -m 755 -d $(DESTDIR)/usr/share/doc/opencas @install -m 644 -D casctl.8 $(DESTDIR)/usr/share/man/man8/casctl.8
@mkdir -p $(DESTDIR)/usr/share/man/man8 @install -m 644 -D open-cas-shutdown.service $(DESTDIR)$(SYSTEMD_DIR)/open-cas-shutdown.service
@install -m 644 casctl.8 $(DESTDIR)/usr/share/man/man8/casctl.8 @install -m 644 -D open-cas.service $(DESTDIR)$(SYSTEMD_DIR)/open-cas.service
@install -m 755 -D open-cas.shutdown $(DESTDIR)$(SYSTEMD_DIR)/../system-shutdown/open-cas.shutdown
@mkdir -p $(DESTDIR)$(SYSTEMD_DIR)
@install -m 644 open-cas-shutdown.service $(DESTDIR)$(SYSTEMD_DIR)/open-cas-shutdown.service
@install -m 644 open-cas.service $(DESTDIR)$(SYSTEMD_DIR)/open-cas.service
@install -m 755 -d $(DESTDIR)$(SYSTEMD_DIR)/../system-shutdown
@install -m 755 open-cas.shutdown $(DESTDIR)$(SYSTEMD_DIR)/../system-shutdown/open-cas.shutdown
endif endif
uninstall: uninstall:

57
utils/open-cas-shutdown
View File

@ -1,57 +0,0 @@
#!/bin/bash
#
# Copyright(c) 2012-2021 Intel Corporation
# SPDX-License-Identifier: BSD-3-Clause
#
#
# open-cas-shutdown Stops Open CAS
#
# chkconfig: 235 05 95
# description: Open Cache Acceleration Software Shutdown Trigger
#
# processname: open-cas-shutdown
### BEGIN INIT INFO
# Provides: open-cas-shutdown
# Required-Start: $local_fs
# Required-Stop: $local_fs
# Default-Start: 2 3 5
# Default-Stop: 0 1 6
# Short-Description: Open Cache Acceleration Software Shutdown Trigger
# Description: Open Cache Acceleration Software Shutdown Trigger
### END INIT INFO
# Execution flow
runfile=/var/lock/subsys/open-cas-shutdown
function umount_cache_volumes()
{
BLOCK_DEV_PREFIX=/dev/cas
INSTANCES=`ls ${BLOCK_DEV_PREFIX}* | egrep [1-9][0-9]*-[1-9][0-9]*`
for inst in $INSTANCES ; do
# Umount any mounted Open CAS devices first
if [[ `cat /etc/mtab | grep $inst | wc -l` -gt 0 ]] ; then
umount $inst &> /dev/null
fi
done
}
case "$1" in
start|restart|reload)
mkdir -p `dirname $runfile`
touch $runfile
exit 0
;;
status)
exit 0
;;
stop)
umount_cache_volumes
/sbin/cas stop
rm -f $runfile
exit $?
;;
*)
exit 1
esac