From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. de8edcf515c7f856d10fad1f5d1421538048fa09
Date: Thu, 02 Jan 2025 09:16:44 +0000 [thread overview]
Message-ID: <4YP1L44xw9z2xT0@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2697 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 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(a)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
reply other threads:[~2025-01-02 9:16 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4YP1L44xw9z2xT0@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox