Add description and conffiles entry for rsyncd to rsync's Makefile. Move rsyncd.conf install to /etc/config/ and adjust initscript accordingly. Allows rsyncd.conf to survive a sysupgrade.
Signed-off-by: Ian Leonard <[email protected]> --- Index: feeds/packages/net/rsync/files/rsyncd.init =================================================================== --- feeds/packages/net/rsync/files/rsyncd.init (revision 27191) +++ feeds/packages/net/rsync/files/rsyncd.init (working copy) @@ -3,11 +3,12 @@ START=50 BIN=/usr/bin/rsync +CONFIG=/etc/config/rsyncd PID=/var/run/rsyncd.pid SSD=start-stop-daemon start() { - $SSD -p $PID -S -x $BIN -- --daemon + $SSD -p $PID -S -x $BIN -- --daemon --config=$CONFIG } stop() { Index: feeds/packages/net/rsync/Makefile =================================================================== --- feeds/packages/net/rsync/Makefile (revision 27191) +++ feeds/packages/net/rsync/Makefile (working copy) @@ -9,7 +9,7 @@ PKG_NAME:=rsync PKG_VERSION:=3.0.8 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://rsync.samba.org/ftp/rsync/src @@ -61,9 +61,19 @@ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/ endef +define Package/rsyncd/description + rsyncd is a configuration file and initscript to + utilize rsync as a daemon. It uses the same binary + as rsync. +endef + +define Package/rsyncd/conffiles +/etc/config/rsyncd +endef + define Package/rsyncd/install - $(INSTALL_DIR) $(1)/etc - $(INSTALL_DATA) ./files/rsyncd.conf $(1)/etc/ + $(INSTALL_DIR) $(1)/etc/config + $(INSTALL_DATA) ./files/rsyncd.conf $(1)/etc/config/rsyncd $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/rsyncd.init $(1)/etc/init.d/rsyncd endef _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
