From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 1a781c8a29b2a8e758ec556d4e6f845b6db78dff
Date: Tue, 22 Dec 2015 11:30:53 +0100 [thread overview]
Message-ID: <20151222103054.2965821E7C@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2286 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, master has been updated
via 1a781c8a29b2a8e758ec556d4e6f845b6db78dff (commit)
via ff441e4d3fb96d71b4d547fb7b4ab65ef18a51bd (commit)
from df00a3f1cd6a23ef48c80e431b8e472a4a340e5b (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 1a781c8a29b2a8e758ec556d4e6f845b6db78dff
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 22 10:27:26 2015 +0000
core96: Correctly call qosctrl
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ff441e4d3fb96d71b4d547fb7b4ab65ef18a51bd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 22 10:26:27 2015 +0000
core96: Fix deleting the old ramdisk directory
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/96/update.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/96/update.sh b/config/rootfiles/core/96/update.sh
index a3cf5cf..acd8b0c 100644
--- a/config/rootfiles/core/96/update.sh
+++ b/config/rootfiles/core/96/update.sh
@@ -34,13 +34,13 @@ done
# Stop services
/etc/init.d/fcron stop
/etc/init.d/collectd stop
-qosctrl stop
+/usr/local/bin/qosctrl stop
# Backup RRDs
if [ -d "/var/log/rrd.bak" ]; then
# Umount ramdisk
umount -l "/var/log/rrd"
- rm -f "/var/log/rrd"
+ rm -rf "/var/log/rrd"
mv "/var/log/rrd.bak/vnstat" "/var/log/vnstat"
mv "/var/log/rrd.bak" "/var/log/rrd"
@@ -83,7 +83,7 @@ fi
/etc/init.d/vnstat start
/etc/init.d/fcron start
/etc/init.d/dnsmasq restart
-qosctrl start
+/usr/local/bin/qosctrl start
# Disable loading of cryptodev
sed -e "s/^cryptodev/# &/g" -i /etc/sysconfig/modules
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2015-12-22 10:30 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=20151222103054.2965821E7C@argus.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