nfs: Install configuration in package

This was lost in the last update

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 87389915e4bf20e12990f19cb651259dc42daeee..c7276816564e497a221476f895ccb1c86975612e 100644 (file)
--- 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 f2637fec225e571b50ae97a13a2019474fdcdaab..00ede63f90da55df6db5f0a5c61418ef5bfacac3 100644 (file)
--- 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 c33eefc964ca6a14af47da0374860b684ea96aca..4701d9e39701ff5ab26bdb58a89b630e128168fd 100644 (file)
--- 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 adfc1a232b49f9397d605091b748327aab4bc3b0..e401894cb3fd6269bd6b595cb5e2800059d02009 100644 (file)
--- 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)