From 96ef85a37e1331829c52d9b6d068a962dbe424bd Mon Sep 17 00:00:00 2001 From: aTanW Date: Thu, 26 Feb 2015 15:51:39 +0300 Subject: [PATCH] gammu: change startup/config file names to avoid potential conflict Signed-Off-By: Vitaly Protsko --- Makefile | 8 ++++---- files/gammu.init | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) --- utils/gammu/Makefile | 8 ++++---- utils/gammu/files/{smsd => gammu} | 0 utils/gammu/files/{smsd.init => gammu.init} | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) rename utils/gammu/files/{smsd => gammu} (100%) rename utils/gammu/files/{smsd.init => gammu.init} (94%) diff --git a/utils/gammu/Makefile b/utils/gammu/Makefile index 02e9be07e2..11a5885a7a 100644 --- a/utils/gammu/Makefile +++ b/utils/gammu/Makefile @@ -36,7 +36,7 @@ CONFIGURE_ARGS:= \ --prefix=/usr \ --cross-root="$(STAGING_DIR) $(TOOLCHAIN_DIR)" \ --enable-shared \ - --without-libdbi \ + --without-libdbi define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ @@ -66,12 +66,12 @@ define Package/gammu/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lib{Gammu*,gsmsd*} $(1)/usr/lib $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_CONF) ./files/smsd $(1)/etc/config/smsd - $(INSTALL_BIN) ./files/smsd.init $(1)/etc/init.d/smsd + $(INSTALL_CONF) ./files/gammu $(1)/etc/config/gammu + $(INSTALL_BIN) ./files/gammu.init $(1)/etc/init.d/gammu endef define Package/gammu/conffiles -/etc/config/smsd +/etc/config/gammu endef $(eval $(call BuildPackage,gammu)) diff --git a/utils/gammu/files/smsd b/utils/gammu/files/gammu similarity index 100% rename from utils/gammu/files/smsd rename to utils/gammu/files/gammu diff --git a/utils/gammu/files/smsd.init b/utils/gammu/files/gammu.init similarity index 94% rename from utils/gammu/files/smsd.init rename to utils/gammu/files/gammu.init index 0a78c48846..6a391d4ac8 100755 --- a/utils/gammu/files/smsd.init +++ b/utils/gammu/files/gammu.init @@ -5,7 +5,7 @@ START=98 USE_PROCD=1 PROG=/usr/bin/gammu-smsd -CONFPFX=/var/smsd +CONFPFX=/var/gammu start_instance() { local conf="$1" @@ -15,7 +15,7 @@ start_instance() { config_get_bool item "$conf" enabled 0 [ $item = 0 ] && return - echo -e "; dont edit. instead look into /etc/config/smsd\n[gammu]\n" > $conffile + echo -e "; dont edit. instead look into /etc/config/gammu\n[gammu]\n" > $conffile config_get item "$conf" device [ -z "$item" ] && return @@ -107,10 +107,10 @@ start_instance() { } start_service() { - config_load smsd + config_load gammu config_foreach start_instance daemon } service_triggers() { - procd_add_reload_trigger "smsd" + procd_add_reload_trigger "gammu" } -- 2.30.2