diff --git a/.gitmodules b/.gitmodules index 5c54ff1..dd627ba 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "ocf"] path = ocf - url = https://github.com/Open-CAS/ocf.git + url = https://git.piicloud.cn/github/ocf.git [submodule "test/functional/test-framework"] path = test/functional/test-framework - url = https://github.com/Open-CAS/test-framework.git + url = https://git.piicloud.cn/github/opencas-test-framework.git diff --git a/modules/Makefile b/modules/Makefile index 5c376fb..7141ec5 100644 --- a/modules/Makefile +++ b/modules/Makefile @@ -52,7 +52,6 @@ distclean: clean distsync install: install_files @$(DEPMOD) - @$(MODPROBE) $(CACHE_MODULE) install_files: @echo "Installing Open-CAS modules" diff --git a/utils/Makefile b/utils/Makefile index 5a36c1b..defabf8 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -26,8 +26,6 @@ install: install_files ifeq (, $(PYTHON3)) $(error package 'python3' not found) else - @$(UDEV) control --reload-rules - @$(SYSTEMCTL) daemon-reload @$(SYSTEMCTL) -q enable open-cas-shutdown @$(SYSTEMCTL) -q enable open-cas @@ -81,11 +79,9 @@ uninstall: $(call remove-file,$(DESTDIR)$(UDEVRULES_DIR)/60-persistent-storage-cas-load.rules) $(call remove-file,$(DESTDIR)$(UDEVRULES_DIR)/60-persistent-storage-cas.rules) - @$(UDEV) control --reload-rules @$(SYSTEMCTL) -q disable open-cas-shutdown @$(SYSTEMCTL) -q disable open-cas - @$(SYSTEMCTL) daemon-reload $(call remove-file,$(DESTDIR)$(SYSTEMD_DIR)/open-cas-shutdown.service) $(call remove-file,$(DESTDIR)$(SYSTEMD_DIR)/open-cas.service) diff --git a/utils/open-cas-shutdown.service b/utils/open-cas-shutdown.service index a82d5d8..90431e3 100644 --- a/utils/open-cas-shutdown.service +++ b/utils/open-cas-shutdown.service @@ -12,7 +12,7 @@ DefaultDependencies=no [Service] Type=oneshot -ExecStart=/sbin/casctl stop +ExecStart=/sbin/casctl stop --flush TimeoutStopSec=604800 [Install]