Difuse/routing
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #35 from nolith/olsrd_conf_fix

Browse source 
Do not delete old olsrd configuration file
This commit is contained in:
Saverio Proto 2014-06-10 12:54:45 +02:00
commit 0c0c2d34a9
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
olsrd/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=olsrd PKG_NAME:=olsrd
PKG_VERSION:=0.6.6.2 PKG_VERSION:=0.6.6.2
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.olsr.org/releases/0.6 PKG_SOURCE_URL:=http://www.olsr.org/releases/0.6
@ -184,6 +184,30 @@ define Package/olsrd/install
$(INSTALL_BIN) ./files/olsrd.hotplug.sh $(1)/etc/hotplug.d/iface/50-olsrd $(INSTALL_BIN) ./files/olsrd.hotplug.sh $(1)/etc/hotplug.d/iface/50-olsrd
endef 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 define Package/olsrd-mod-arprefresh/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/arprefresh/olsrd_arprefresh.so.* $(1)/usr/lib/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/arprefresh/olsrd_arprefresh.so.* $(1)/usr/lib/