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 de8edcf515c7f856d10fad1f5d1421538048fa09 (commit) via e3b5000b8318591a239125560b9e5fa101a3802e (commit) from fb0fc29abc107cf356ecdfe01299427e683144e0 (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 de8edcf515c7f856d10fad1f5d1421538048fa09 Merge: fb0fc29abc e3b5000b83 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Jan 2 10:16:08 2025 +0100
Merge remote-tracking branch 'origin/master' into next
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/elinks | 7 ++++--- config/rootfiles/oldcore/191/update.sh | 2 +- lfs/elinks | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-)
Difference in files: diff --git a/config/rootfiles/common/elinks b/config/rootfiles/common/elinks index 3c4ad031a..004caac03 100644 --- a/config/rootfiles/common/elinks +++ b/config/rootfiles/common/elinks @@ -1,6 +1,7 @@ -#root/.config/.elinks -root/.config/.elinks/bookmarks -root/.config/.elinks/globhist +#root/.config +#root/.config/elinks +root/.config/elinks/bookmarks +root/.config/elinks/globhist usr/local/bin/elinks #usr/local/etc #usr/local/etc/elinks diff --git a/config/rootfiles/oldcore/191/update.sh b/config/rootfiles/oldcore/191/update.sh index acfa01eb4..85c9738f7 100644 --- a/config/rootfiles/oldcore/191/update.sh +++ b/config/rootfiles/oldcore/191/update.sh @@ -49,7 +49,7 @@ fi
# move elinks config to new dir if [ -e /root/.elinks/* ]; then - mv /root/.elinks/* /root/.config/.elinks/ + mv /root/.elinks/* /root/.config/elinks/ rm -rf /root/.elinks fi
diff --git a/lfs/elinks b/lfs/elinks index 64b7b7fce..389cd1772 100644 --- a/lfs/elinks +++ b/lfs/elinks @@ -87,9 +87,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Suppress first welcome dialog by creating bookmark # and history files for root - mkdir -p /root/.config/.elinks - touch /root/.config/.elinks/bookmarks - touch /root/.config/.elinks/globhist + mkdir -p /root/.config/elinks + touch /root/.config/elinks/bookmarks + touch /root/.config/elinks/globhist
@rm -rf $(DIR_APP) @$(POSTBUILD)
hooks/post-receive -- IPFire 2.x development tree