[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3eea5c6f3a8200cfcb7b8024eb60ab745744a738

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3eea5c6f3a8200cfcb7b8024eb60ab745744a738

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 4915 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  3eea5c6f3a8200cfcb7b8024eb60ab745744a738 (commit)
       via  77729e5be88001c7b9f972eb80299c52e65c446f (commit)
      from  1ee8c6732fe33525e43fbc5f4d387eec9117a035 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3eea5c6f3a8200cfcb7b8024eb60ab745744a738
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Nov 28 19:07:10 2018 +0000

    nfs: Add backup include file
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 77729e5be88001c7b9f972eb80299c52e65c446f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Nov 28 19:02:53 2018 +0000

    nfs: Install configuration in package
    
    This was lost in the last update
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/backup/includes/nfs         |  2 ++
 config/rootfiles/common/configroot |  2 --
 config/rootfiles/packages/nfs      |  3 +++
 lfs/configroot                     |  3 +--
 lfs/nfs                            | 13 +++++++++++--
 5 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 config/backup/includes/nfs

Difference in files:
diff --git a/config/backup/includes/nfs b/config/backup/includes/nfs
new file mode 100644
index 000000000..25301f9ce
--- /dev/null
+++ b/config/backup/includes/nfs
@@ -0,0 +1,2 @@
+etc/exports
+var/ipfire/nfs/nfs-server
diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 87389915e..c72768165 100644
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -124,8 +124,6 @@ var/ipfire/modem-lib.pl
 #var/ipfire/modem/settings
 var/ipfire/modem-lib.pl
 var/ipfire/network-functions.pl
-#var/ipfire/nfs
-#var/ipfire/nfs/nfs-server
 var/ipfire/optionsfw
 #var/ipfire/optionsfw/settings
 var/ipfire/ovpn
diff --git a/config/rootfiles/packages/nfs b/config/rootfiles/packages/nfs
index f2637fec2..16059abdc 100644
--- a/config/rootfiles/packages/nfs
+++ b/config/rootfiles/packages/nfs
@@ -68,6 +68,9 @@ usr/sbin/start-statd
 #usr/share/man/man8/sm-notify.8
 #usr/share/man/man8/statd.8
 #usr/share/man/man8/umount.nfs.8
+var/ipfire/backup/addons/includes/nfs
+#var/ipfire/nfs
+var/ipfire/nfs/nfs-server
 #var/lib/nfs
 var/lib/nfs/etab
 var/lib/nfs/rmtab
diff --git a/lfs/configroot b/lfs/configroot
index c33eefc96..4701d9e39 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -52,7 +52,7 @@ $(TARGET) :
 	# Create all directories
 	for i in addon-lang auth backup ca captive certs connscheduler crls ddns dhcp dhcpc dns dnsforward \
 			ethernet extrahd/bin fwlogs fwhosts firewall isdn key langs logging mac main \
-			menu.d modem nfs optionsfw \
+			menu.d modem optionsfw \
 			ovpn patches pakfire portfw ppp private proxy/advanced/cre \
 			proxy/calamaris/bin qos/bin red remote sensors snort time \
 			updatexlrator/bin updatexlrator/autocheck urlfilter/autoupdate urlfilter/bin upnp vpn \
@@ -92,7 +92,6 @@ $(TARGET) :
 	cp $(DIR_SRC)/config/menu/*				$(CONFIG_ROOT)/menu.d/
 	cp $(DIR_SRC)/config/cfgroot/modem-defaults		$(CONFIG_ROOT)/modem/defaults
 	cp $(DIR_SRC)/config/cfgroot/modem-settings		$(CONFIG_ROOT)/modem/settings
-	cp $(DIR_SRC)/config/cfgroot/nfs-server			$(CONFIG_ROOT)/nfs/nfs-server
 	cp $(DIR_SRC)/config/cfgroot/proxy-acl			$(CONFIG_ROOT)/proxy/acl-1.4
 	cp $(DIR_SRC)/config/qos/*						$(CONFIG_ROOT)/qos/bin/
 	cp $(DIR_SRC)/config/cfgroot/main-settings		$(CONFIG_ROOT)/main/settings
diff --git a/lfs/nfs b/lfs/nfs
index adfc1a232..4083073e2 100644
--- a/lfs/nfs
+++ b/lfs/nfs
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nfs
-PAK_VER    = 11
+PAK_VER    = 13
 
 DEPS       = "rpcbind"
 
@@ -100,7 +100,16 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install
-	#install initscripts
+
+	# Install initscript
 	$(call INSTALL_INITSCRIPT,nfs-server)
+
+	# Install configuration
+	install -v -m 644 $(DIR_SRC)/config/cfgroot/nfs-server $(CONFIG_ROOT)/nfs/nfs-server
+
+	# Install backup include
+	install -v -m 644 $(DIR_SRC)/config/backup/includes/nfs \
+		 /var/ipfire/backup/addons/includes/nfs
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)


hooks/post-receive
--
IPFire 2.x development tree