From: Ulrich Weber Date: Tue, 25 Aug 2015 08:12:58 +0000 (+0200) Subject: strongswan: dont overwrite ipsec.conf and ipsec.user during upgrade X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=046f800efb2c3fa321bf4da428618998e422da4c;p=feed%2Fpackages.git strongswan: dont overwrite ipsec.conf and ipsec.user during upgrade Signed-off-by: Ulrich Weber --- diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile index f0ea175b17..f78c9ead32 100644 --- a/net/strongswan/Makefile +++ b/net/strongswan/Makefile @@ -348,10 +348,12 @@ endef define Package/strongswan/install $(INSTALL_DIR) $(1)/etc - $(CP) $(PKG_INSTALL_DIR)/etc/strongswan.conf $(1)/etc/ + $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/ipsec.conf $(1)/etc/ + $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/strongswan.conf $(1)/etc/ $(INSTALL_DIR) $(1)/usr/lib/ipsec $(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/{libstrongswan.so.*,libhydra.so.*} $(1)/usr/lib/ipsec/ $(INSTALL_CONF) ./files/ipsec.secrets $(1)/etc/ + $(INSTALL_CONF) ./files/ipsec.user $(1)/etc/ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/ipsec.init $(1)/etc/init.d/ipsec endef @@ -415,8 +417,6 @@ define Plugin/stroke/install $(INSTALL_DIR) $(1)/etc/ipsec.d/private $(INSTALL_DIR) $(1)/etc/ipsec.d/reqs - $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/ipsec.conf $(1)/etc/ - $(INSTALL_DIR) $(1)/usr/lib/ipsec/plugins $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/ipsec/{starter,stroke} $(1)/usr/lib/ipsec/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/plugins/libstrongswan-stroke.so $(1)/usr/lib/ipsec/plugins/ @@ -427,7 +427,6 @@ define Plugin/updown/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/_updown $(1)/usr/lib/ipsec/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/plugins/libstrongswan-updown.so $(1)/usr/lib/ipsec/plugins/ $(INSTALL_DIR) $(1)/etc - $(INSTALL_CONF) ./files/ipsec.user $(1)/etc/ endef define Plugin/whitelist/install