Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ipv6 #54

Closed
wants to merge 9 commits into from
Closed

Ipv6 #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ff441e4
core96: Fix deleting the old ramdisk directory
mtremer Dec 22, 2015
1a781c8
core96: Correctly call qosctrl
mtremer Dec 22, 2015
32dd84e
core96: Regenerate language cache
mtremer Dec 22, 2015
c26171b
core96: remove rrd ramdisk entry from fstab
Dec 23, 2015
216c829
Enable correct display of ipv6 entries in Firewall log pages of web UI.
MEitelwein Jan 9, 2016
befa648
Fix regex to extract firewall chain for ipv6 in showrequestfrom*.dat
MEitelwein Jan 9, 2016
63bf24a
Firewall chain was not extracted correctly when ipv6 uses bridge
MEitelwein Jan 9, 2016
8852982
Fixed detection of firewall chain when bridge is used for ipv6
MEitelwein Jan 9, 2016
51ffe2f
No code changes, fixed formatting by replacing spaces with tabs
MEitelwein Jan 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions config/rootfiles/core/96/update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -56,7 +56,10 @@ rm -f /etc/rc.d/init.d/tmpfs \
extract_files

# Update Language cache
# /usr/local/bin/update-lang-cache
/usr/local/bin/update-lang-cache

# Remove Ramdisk entry from fstab
sed -i -e "s|^none\s/var/log/rrd.*||g" /etc/fstab

# Keep (almost) old ramdisk behaviour
if [ ! -e "/etc/sysconfig/ramdisk" ]; then
Expand All @@ -83,7 +86,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
Expand Down
Loading