gammu: change startup/config file names to avoid potential conflict

Signed-Off-By: Vitaly Protsko <redacted>
---
 Makefile         |    8 ++++----
 files/gammu.init |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/utils/gammu/Makefile b/utils/gammu/Makefile
index 02e9be07e2e204ce87ebe35bd59cfbec11d48b15..11a5885a7ad4b9c7ba7be7aee228f68cde422515 100644 (file)
--- 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 0a78c48846f8efbd000b330e09a7a0a1891e41bb..6a391d4ac8e0fe784d70188ae1727c6793c1aa8d 100755 (executable)
--- 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"
 }