From 77729e5be88001c7b9f972eb80299c52e65c446f Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 28 Nov 2018 19:02:53 +0000 Subject: [PATCH] nfs: Install configuration in package This was lost in the last update Signed-off-by: Michael Tremer --- config/rootfiles/common/configroot | 2 -- config/rootfiles/packages/nfs | 2 ++ lfs/configroot | 3 +-- lfs/nfs | 9 +++++++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index 87389915e4..c727681656 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 f2637fec22..00ede63f90 100644 --- a/config/rootfiles/packages/nfs +++ b/config/rootfiles/packages/nfs @@ -68,6 +68,8 @@ 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/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 c33eefc964..4701d9e397 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 adfc1a232b..e401894cb3 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 = 12 DEPS = "rpcbind" @@ -100,7 +100,12 @@ $(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 + @rm -rf $(DIR_APP) @$(POSTBUILD) -- 2.39.5