[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipfire-scm
Subject:    [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4f6ef735420f85180a393d729df199c5
From:       Arne Fitzenreiter <git () ipfire ! org>
Date:       2021-11-25 23:03:54
Message-ID: 4J0YMv0WM4z2xgM () people01 ! haj ! ipfire ! org
[Download RAW message or body]

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  4f6ef735420f85180a393d729df199c56077afa4 (commit)
      from  6e739d105088444b9380cb27d2fffe22cedf43a7 (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 4f6ef735420f85180a393d729df199c56077afa4
Author: Arne Fitzenreiter <arne_f@ipfire.org>
Date:   Thu Nov 25 17:06:33 2021 +0100

    cfgroot: install manualpages file
    
    this fix the 500 internal server error becuase this file
    was not installed by the patch that add the wiki links.
    
    Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

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

Summary of changes:
 config/rootfiles/common/configroot        | 1 +
 config/rootfiles/core/162/filelists/files | 1 +
 lfs/configroot                            | 1 +
 3 files changed, 3 insertions(+)

Difference in files:
diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index d496594bc..2dfc8ae1f 100644
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -105,6 +105,7 @@ var/ipfire/main
 #var/ipfire/main/routing
 #var/ipfire/main/security
 #var/ipfire/main/settings
+#var/ipfire/main/manualpages
 #var/ipfire/menu.d
 var/ipfire/menu.d/00-menu.main
 var/ipfire/menu.d/10-system.menu
diff --git a/config/rootfiles/core/162/filelists/files b/config/rootfiles/core/162/filelists/files
index 96b65142a..054293a97 100644
--- a/config/rootfiles/core/162/filelists/files
+++ b/config/rootfiles/core/162/filelists/files
@@ -12,4 +12,5 @@ srv/web/ipfire/html/themes/ipfire/include/functions.pl
 var/ipfire/general-functions.pl
 var/ipfire/header.pl
 var/ipfire/location-functions.pl
+var/ipfire/main/manualpages
 var/ipfire/qos/bin/makeqosscripts.pl
diff --git a/lfs/configroot b/lfs/configroot
index c528bd6d9..e0156c746 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -95,6 +95,7 @@ $(TARGET) :
 	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
+	cp $(DIR_SRC)/config/cfgroot/manualpages		$(CONFIG_ROOT)/main/
 	cp $(DIR_SRC)/config/cfgroot/ssh-settings		$(CONFIG_ROOT)/remote/settings
 	cp $(DIR_SRC)/config/cfgroot/time-settings		$(CONFIG_ROOT)/time/settings
 	cp $(DIR_SRC)/config/cfgroot/logging-settings	$(CONFIG_ROOT)/logging/settings


hooks/post-receive
--
IPFire 2.x development tree
_______________________________________________
IPFire-SCM mailing list
IPFire-SCM@lists.ipfire.org
https://lists.ipfire.org/mailman/listinfo/ipfire-scm
[prev in list] [next in list] [prev in thread] [next in thread]