olsrd: do not remove the old config file if present

[feed/routing.git] / olsrd / Makefile

diff --git a/olsrd/Makefile b/olsrd/Makefile
index e5be87b0403d9697ff68f43c83b8ca2f75014879..48dd7d20402914fefd8d3f0cadfd0fcad4854a4f 100644 (file)
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=olsrd
-PKG_VERSION:=0.6.5.2
-PKG_RELEASE:=1
+PKG_VERSION:=0.6.6.2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.olsr.org/releases/0.6
 
-PKG_MD5SUM:=190e3c763656f71d3ca6868db7658f43
+PKG_MD5SUM:=e4e04bb033cffd99b3be397fa9063a54
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -37,7 +37,8 @@ define Package/olsrd
 endef
 
 define Package/olsrd/conffiles
-/etc/config/olsrd
+/etc/config/olsrd4
+/etc/config/olsrd6
 endef
 
 define Package/olsrd-mod-arprefresh
@@ -169,12 +170,42 @@ define Build/Compile
 endef
 
 define Package/olsrd/install
+       $(INSTALL_DIR) $(1)/lib/functions
+       $(INSTALL_DATA) ./files/olsrd.init $(1)/lib/functions/olsrd.sh
        $(INSTALL_DIR) $(1)/etc/config
-       $(INSTALL_DATA) ./files/olsrd.config $(1)/etc/config/olsrd
+       $(INSTALL_DATA) ./files/olsrd4.config $(1)/etc/config/olsrd4
+       $(INSTALL_DATA) ./files/olsrd6.config $(1)/etc/config/olsrd6
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/olsrd $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc/init.d
-       $(INSTALL_BIN) ./files/olsrd.init $(1)/etc/init.d/olsrd
+       $(INSTALL_BIN) ./files/olsrd4.init $(1)/etc/init.d/olsrd4
+       $(INSTALL_BIN) ./files/olsrd6.init $(1)/etc/init.d/olsrd6
+       $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+       $(INSTALL_BIN) ./files/olsrd.hotplug.sh $(1)/etc/hotplug.d/iface/50-olsrd
+endef
+
+define Package/olsrd/preinst
+#!/bin/sh
+# check if we are on real system
+if [ -z "$${IPKG_INSTROOT}" ]; then
+       [ -f /etc/config/olsrd ] && cp /etc/config/olsrd /etc/config/olsrd.opkg-old
+fi
+exit 0
+endef
+
+define Package/olsrd/postinst
+#!/bin/sh
+# check if we are on real system
+if [ -z "$${IPKG_INSTROOT}" ]; then
+        if [ -f /etc/config/olsrd.opkg-old ]; then
+               mv /etc/config/olsrd.opkg-old /etc/config/olsrd
+               echo "**********  WARNING  ***************"
+               echo "/etc/config/olsrd is no longer used! This will prevent olsrd to start."
+               echo "Please use /etc/config/olsrd4 for IPv4 and /etc/config/olrsd6 for IPv6"
+               echo "Remember to remove option IpVersion from your config file"
+       fi
+fi
+exit 0
 endef
 
 define Package/olsrd-mod-arprefresh/install