mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-27 19:23:24 +02:00
Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x
Conflicts: make.sh
This commit is contained in:
Michael Tremer
@@ -1 +0,0 @@
|
||||
../../../common/Net_SSLeay
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/collectd
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/compat-wireless
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/dosfstools
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/e2fsprogs
|
||||
@@ -1,169 +0,0 @@
|
||||
etc/system-release
|
||||
etc/issue
|
||||
etc/e2fsck.conf
|
||||
etc/httpd/conf/vhosts.d/ipfire-interface.conf
|
||||
etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
|
||||
etc/rc.d/init.d/leds
|
||||
etc/rc.d/init.d/rc
|
||||
etc/rc.d/init.d/snort
|
||||
etc/rc.d/init.d/networking/red.up/50-ovpn
|
||||
etc/rc.d/init.d/networking/dhcpcd.exe
|
||||
etc/rc.d/rc0.d/K78snort
|
||||
etc/rc.d/rc0.d/K79leds
|
||||
etc/rc.d/rc3.d/S21leds
|
||||
etc/rc.d/rc6.d/K78snort
|
||||
etc/rc.d/rc6.d/K79leds
|
||||
etc/udev/rules.d/52-nut-usbups.rules
|
||||
etc/udev/rules.d/xpp.rules
|
||||
var/ipfire/backup/bin/backup.pl
|
||||
var/ipfire/header.pl
|
||||
var/ipfire/menu.d/50-firewall.menu
|
||||
var/ipfire/outgoing/bin/outgoingfw.pl
|
||||
var/ipfire/graphs.pl
|
||||
var/ipfire/general-functions.pl
|
||||
etc/modprobe.d/cfg80211
|
||||
etc/modprobe.d/pcspeaker
|
||||
var/ipfire/qos/bin/makeqosscripts.pl
|
||||
srv/web/ipfire/cgi-bin/connections.cgi
|
||||
srv/web/ipfire/cgi-bin/extrahd.cgi
|
||||
srv/web/ipfire/cgi-bin/ids.cgi
|
||||
srv/web/ipfire/cgi-bin/index.cgi
|
||||
srv/web/ipfire/cgi-bin/iptables.cgi
|
||||
srv/web/ipfire/cgi-bin/logs.cgi/config.dat
|
||||
srv/web/ipfire/cgi-bin/netother.cgi
|
||||
srv/web/ipfire/cgi-bin/outgoingfw.cgi
|
||||
srv/web/ipfire/cgi-bin/outgoinggrp.cgi
|
||||
srv/web/ipfire/cgi-bin/ovpnmain.cgi
|
||||
srv/web/ipfire/cgi-bin/services.cgi
|
||||
srv/web/ipfire/cgi-bin/time.cgi
|
||||
srv/web/ipfire/cgi-bin/updatexlrator.cgi
|
||||
srv/web/ipfire/cgi-bin/urlfilter.cgi
|
||||
srv/web/ipfire/cgi-bin/vpnmain.cgi
|
||||
srv/web/ipfire/cgi-bin/wireless.cgi
|
||||
srv/web/ipfire/html/themes/ipfire/include/functions.pl
|
||||
srv/web/ipfire/html/themes/maniac/include/functions.pl
|
||||
var/ipfire/langs/de.pl
|
||||
var/ipfire/langs/en.pl
|
||||
var/ipfire/langs/es.pl
|
||||
var/ipfire/langs/fr.pl
|
||||
var/ipfire/langs/list
|
||||
var/ipfire/main/disable_nf_sip
|
||||
var/ipfire/outgoing/groups
|
||||
etc/rc.d/init.d/firewall
|
||||
etc/rc.d/init.d/ipsec
|
||||
etc/rc.d/init.d/network
|
||||
etc/rc.d/init.d/ntp
|
||||
etc/rc.d/init.d/modules
|
||||
usr/local/bin/ipsecctrl
|
||||
usr/local/bin/rebuildhosts
|
||||
usr/local/bin/syslogdctrl
|
||||
usr/local/bin/wirelessctrl
|
||||
usr/local/sbin/setup
|
||||
usr/sbin/openvpn
|
||||
opt/pakfire/lib/functions.sh
|
||||
usr/local/share/GeoIP/GeoIP.dat
|
||||
usr/share/hwdata/pci.ids
|
||||
usr/share/hwdata/usb.ids
|
||||
usr/bin/squidGuard
|
||||
usr/sbin/redirect_wrapper
|
||||
var/lib/squidguard
|
||||
var/urlrepo
|
||||
usr/sbin/klogd
|
||||
usr/sbin/syslogd
|
||||
etc/squid/cachemgr.conf
|
||||
etc/squid/errors
|
||||
etc/squid/mime.conf
|
||||
etc/squid/msntauth.conf
|
||||
etc/squid/squid.conf
|
||||
srv/web/ipfire/cgi-bin/cachemgr.cgi
|
||||
usr/bin/squidclient
|
||||
usr/lib/squid/auth
|
||||
usr/lib/squid/diskd-daemon
|
||||
usr/lib/squid/errors.ipfire/English/ERR_ACCESS_DENIED
|
||||
usr/lib/squid/errors.ipfire/English/ERR_CACHE_ACCESS_DENIED
|
||||
usr/lib/squid/errors.ipfire/English/ERR_CACHE_MGR_ACCESS_DENIED
|
||||
usr/lib/squid/errors.ipfire/English/ERR_CANNOT_FORWARD
|
||||
usr/lib/squid/errors.ipfire/English/ERR_CONNECT_FAIL
|
||||
usr/lib/squid/errors.ipfire/English/ERR_DNS_FAIL
|
||||
usr/lib/squid/errors.ipfire/English/ERR_FORWARDING_DENIED
|
||||
usr/lib/squid/errors.ipfire/English/ERR_FTP_DISABLED
|
||||
usr/lib/squid/errors.ipfire/English/ERR_FTP_FAILURE
|
||||
usr/lib/squid/errors.ipfire/English/ERR_FTP_FORBIDDEN
|
||||
usr/lib/squid/errors.ipfire/English/ERR_FTP_NOT_FOUND
|
||||
usr/lib/squid/errors.ipfire/English/ERR_FTP_PUT_CREATED
|
||||
usr/lib/squid/errors.ipfire/English/ERR_FTP_PUT_ERROR
|
||||
usr/lib/squid/errors.ipfire/English/ERR_FTP_PUT_MODIFIED
|
||||
usr/lib/squid/errors.ipfire/English/ERR_FTP_UNAVAILABLE
|
||||
usr/lib/squid/errors.ipfire/English/ERR_INVALID_REQ
|
||||
usr/lib/squid/errors.ipfire/English/ERR_INVALID_RESP
|
||||
usr/lib/squid/errors.ipfire/English/ERR_INVALID_URL
|
||||
usr/lib/squid/errors.ipfire/English/ERR_LIFETIME_EXP
|
||||
usr/lib/squid/errors.ipfire/English/ERR_NO_RELAY
|
||||
usr/lib/squid/errors.ipfire/English/ERR_ONLY_IF_CACHED_MISS
|
||||
usr/lib/squid/errors.ipfire/English/ERR_READ_ERROR
|
||||
usr/lib/squid/errors.ipfire/English/ERR_READ_TIMEOUT
|
||||
usr/lib/squid/errors.ipfire/English/ERR_SHUTTING_DOWN
|
||||
usr/lib/squid/errors.ipfire/English/ERR_SOCKET_FAILURE
|
||||
usr/lib/squid/errors.ipfire/English/ERR_TOO_BIG
|
||||
usr/lib/squid/errors.ipfire/English/ERR_UNSUP_REQ
|
||||
usr/lib/squid/errors.ipfire/English/ERR_URN_RESOLVE
|
||||
usr/lib/squid/errors.ipfire/English/ERR_WRITE_ERROR
|
||||
usr/lib/squid/errors.ipfire/English/ERR_ZERO_SIZE_OBJECT
|
||||
usr/lib/squid/errors.ipfire/German/ERR_ACCESS_DENIED
|
||||
usr/lib/squid/errors.ipfire/German/ERR_CACHE_ACCESS_DENIED
|
||||
usr/lib/squid/errors.ipfire/German/ERR_CACHE_MGR_ACCESS_DENIED
|
||||
usr/lib/squid/errors.ipfire/German/ERR_CANNOT_FORWARD
|
||||
usr/lib/squid/errors.ipfire/German/ERR_CONNECT_FAIL
|
||||
usr/lib/squid/errors.ipfire/German/ERR_DNS_FAIL
|
||||
usr/lib/squid/errors.ipfire/German/ERR_FORWARDING_DENIED
|
||||
usr/lib/squid/errors.ipfire/German/ERR_FTP_DISABLED
|
||||
usr/lib/squid/errors.ipfire/German/ERR_FTP_FAILURE
|
||||
usr/lib/squid/errors.ipfire/German/ERR_FTP_FORBIDDEN
|
||||
usr/lib/squid/errors.ipfire/German/ERR_FTP_NOT_FOUND
|
||||
usr/lib/squid/errors.ipfire/German/ERR_FTP_PUT_CREATED
|
||||
usr/lib/squid/errors.ipfire/German/ERR_FTP_PUT_ERROR
|
||||
usr/lib/squid/errors.ipfire/German/ERR_FTP_PUT_MODIFIED
|
||||
usr/lib/squid/errors.ipfire/German/ERR_FTP_UNAVAILABLE
|
||||
usr/lib/squid/errors.ipfire/German/ERR_INVALID_REQ
|
||||
usr/lib/squid/errors.ipfire/German/ERR_INVALID_RESP
|
||||
usr/lib/squid/errors.ipfire/German/ERR_INVALID_URL
|
||||
usr/lib/squid/errors.ipfire/German/ERR_LIFETIME_EXP
|
||||
usr/lib/squid/errors.ipfire/German/ERR_NO_RELAY
|
||||
usr/lib/squid/errors.ipfire/German/ERR_ONLY_IF_CACHED_MISS
|
||||
usr/lib/squid/errors.ipfire/German/ERR_READ_ERROR
|
||||
usr/lib/squid/errors.ipfire/German/ERR_READ_TIMEOUT
|
||||
usr/lib/squid/errors.ipfire/German/ERR_SHUTTING_DOWN
|
||||
usr/lib/squid/errors.ipfire/German/ERR_SOCKET_FAILURE
|
||||
usr/lib/squid/errors.ipfire/German/ERR_TOO_BIG
|
||||
usr/lib/squid/errors.ipfire/German/ERR_UNSUP_REQ
|
||||
usr/lib/squid/errors.ipfire/German/ERR_URN_RESOLVE
|
||||
usr/lib/squid/errors.ipfire/German/ERR_WRITE_ERROR
|
||||
usr/lib/squid/errors.ipfire/German/ERR_ZERO_SIZE_OBJECT
|
||||
usr/lib/squid/errors/English
|
||||
usr/lib/squid/errors/German
|
||||
usr/lib/squid/icons
|
||||
usr/lib/squid/logfile-daemon
|
||||
usr/lib/squid/mib.txt
|
||||
usr/lib/squid/msnt_auth
|
||||
usr/lib/squid/ncsa_auth
|
||||
usr/lib/squid/ntlm_auth
|
||||
usr/lib/squid/smb_auth
|
||||
usr/lib/squid/smb_auth.pl
|
||||
usr/lib/squid/smb_auth.sh
|
||||
usr/lib/squid/squid_ldap_auth
|
||||
usr/lib/squid/unlinkd
|
||||
usr/sbin/squid
|
||||
usr/sbin/updxlrator
|
||||
var/ipfire/updatexlrator/autocheck/cron.daily
|
||||
var/ipfire/updatexlrator/autocheck/cron.monthly
|
||||
var/ipfire/updatexlrator/autocheck/cron.weekly
|
||||
var/ipfire/updatexlrator/bin/checkdeaddl
|
||||
var/ipfire/updatexlrator/bin/checkup
|
||||
var/ipfire/updatexlrator/bin/convert
|
||||
var/ipfire/updatexlrator/bin/download
|
||||
var/ipfire/updatexlrator/bin/lscache
|
||||
var/ipfire/updatexlrator/updxlrator-lib.pl
|
||||
var/log/cache
|
||||
var/log/updatexlrator
|
||||
usr/local/bin/vpn-watch
|
||||
srv/web/ipfire/html/images/go-down.png
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/fuse
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/iptables
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/liboping
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/mISDN
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/mISDNuser
|
||||
@@ -1,8 +0,0 @@
|
||||
var/ipfire/menu.d/00-menu.main
|
||||
var/ipfire/menu.d/10-system.menu
|
||||
var/ipfire/menu.d/20-status.menu
|
||||
var/ipfire/menu.d/30-network.menu
|
||||
var/ipfire/menu.d/40-services.menu
|
||||
var/ipfire/menu.d/50-firewall.menu
|
||||
var/ipfire/menu.d/60-ipfire.menu
|
||||
var/ipfire/menu.d/70-log.menu
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/mkinitcpio
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/openssh
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/openssl
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/pcre
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/reiser4progs
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/reiserfsprogs
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/rrdtool
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/snort
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/xz
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/zlib
|
||||
@@ -1 +0,0 @@
|
||||
DEPS=""
|
||||
@@ -1,277 +0,0 @@
|
||||
#!/bin/bash
|
||||
############################################################################
|
||||
# #
|
||||
# This file is part of the IPFire Firewall. #
|
||||
# #
|
||||
# IPFire is free software; you can redistribute it and/or modify #
|
||||
# it under the terms of the GNU General Public License as published by #
|
||||
# the Free Software Foundation; either version 3 of the License, or #
|
||||
# (at your option) any later version. #
|
||||
# #
|
||||
# IPFire is distributed in the hope that it will be useful, #
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
|
||||
# GNU General Public License for more details. #
|
||||
# #
|
||||
# You should have received a copy of the GNU General Public License #
|
||||
# along with IPFire; if not, write to the Free Software #
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
||||
# #
|
||||
# Copyright (C) 2010 IPFire-Team <info@ipfire.org>. #
|
||||
# #
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
|
||||
#
|
||||
OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2`
|
||||
#
|
||||
# Test if we running on xen
|
||||
#
|
||||
uname -r | grep "ipfire-xen";
|
||||
if [ ${?} = 0 ]; then
|
||||
#Xen Kernel is active
|
||||
NEWVERSION="2.7-xen"
|
||||
else
|
||||
#Normal Kernel
|
||||
NEWVERSION="2.7"
|
||||
fi
|
||||
#
|
||||
KVER="2.6.32.15"
|
||||
ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1`
|
||||
MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
|
||||
# Nur den letzten Parameter verwenden
|
||||
echo $MOUNT > /dev/null
|
||||
MOUNT=$_
|
||||
if [ ! $MOUNT == "rw" ]; then
|
||||
MOUNT="ro"
|
||||
fi
|
||||
#
|
||||
# check if we the backup file already exist
|
||||
if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then
|
||||
echo Moving backup to backup-old ...
|
||||
mv -f /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \
|
||||
/var/ipfire/backup/core-upgrade_$KVER-old.tar.bz2
|
||||
fi
|
||||
echo First we made a backup of all files that was inside of the
|
||||
echo update archive. This may take a while ...
|
||||
# Add some files that are not in the package to backup
|
||||
echo lib/modules >> /opt/pakfire/tmp/ROOTFILES
|
||||
echo boot >> /opt/pakfire/tmp/ROOTFILES
|
||||
echo etc/sysconfig/lm_sensors >> /opt/pakfire/tmp/ROOTFILES
|
||||
echo usr/lib/ipsec >> /opt/pakfire/tmp/ROOTFILES
|
||||
echo usr/libexec/ipsec >> /opt/pakfire/tmp/ROOTFILES
|
||||
# exclude squid cache from backup
|
||||
sed -i -e "s|^var/log/cache|#var/log/cache|g" /opt/pakfire/tmp/ROOTFILES
|
||||
# Backup the files
|
||||
tar cjvf /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \
|
||||
-C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' > /dev/null 2>&1
|
||||
|
||||
#
|
||||
# Stop Sevices
|
||||
#
|
||||
/etc/init.d/collectd stop
|
||||
/etc/init.d/squid stop
|
||||
/etc/init.d/ipsec stop
|
||||
/etc/init.d/snort stop
|
||||
|
||||
echo
|
||||
echo Update Kernel to $KVER ...
|
||||
# Remove old kernel, configs, initrd, modules ...
|
||||
#
|
||||
rm -rf /boot/System.map-*
|
||||
rm -rf /boot/config-*
|
||||
rm -rf /boot/ipfirerd-*
|
||||
rm -rf /boot/vmlinuz-*
|
||||
rm -rf /lib/modules/*-ipfire
|
||||
# Don't remove all old xen modules. Kernel may stored outside.
|
||||
# only from 2.6.27.25 and 31
|
||||
rm -rf /lib/modules/2.6.27.25-ipfire-xen
|
||||
rm -rf /lib/modules/2.6.27.31-ipfire-xen
|
||||
#
|
||||
# remove openswan libs ...
|
||||
#
|
||||
rm -rf /usr/lib/ipsec
|
||||
rm -rf /usr/libexec/ipsec
|
||||
#
|
||||
# old snort libs and rules ...
|
||||
#
|
||||
rm -rf /usr/lib/snort_*
|
||||
rm -rf /etc/snort
|
||||
#
|
||||
# mISDN Files that was moved to sbin
|
||||
#
|
||||
rm -rf /usr/bin/misdn_rename
|
||||
rm -rf /usr/bin/misdn_cleanl2
|
||||
#
|
||||
# Backup grub.conf
|
||||
#
|
||||
cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org
|
||||
#
|
||||
# Stop sysklogd
|
||||
/etc/init.d/sysklogd stop
|
||||
#
|
||||
# Unpack the updated files
|
||||
#
|
||||
echo
|
||||
echo Unpack the updated files ...
|
||||
#
|
||||
tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
|
||||
--no-overwrite-dir
|
||||
#
|
||||
# Start sysklogd
|
||||
/etc/init.d/sysklogd start
|
||||
#
|
||||
# Modify grub.conf
|
||||
#
|
||||
echo
|
||||
echo Update grub configuration ...
|
||||
sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf
|
||||
sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf
|
||||
sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf
|
||||
|
||||
if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then
|
||||
echo "grub use default console ..."
|
||||
else
|
||||
echo "grub use serial console ..."
|
||||
sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf
|
||||
sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf
|
||||
sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf
|
||||
sed -i -e "s| panic=10 | console=ttyS0,38400n8 panic=10 |g" /boot/grub/grub.conf
|
||||
fi
|
||||
#
|
||||
# Made emergency - initramdisk
|
||||
#
|
||||
echo
|
||||
echo Create new Initramdisks ...
|
||||
cp -f /etc/mkinitcpio.conf /etc/mkinitcpio.conf.org
|
||||
sed -i "s| autodetect | |g" /etc/mkinitcpio.conf
|
||||
mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER-emergency.img
|
||||
cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf
|
||||
#
|
||||
# Made initramdisk
|
||||
#
|
||||
if [ "${ROOT:0:7}" == "/dev/sd" ]; then
|
||||
# Remove ide hook if root is on sda
|
||||
sed -i "s| ide | |g" /etc/mkinitcpio.conf
|
||||
else
|
||||
if [ "${ROOT:0:7}" == "/dev/hd" ]; then
|
||||
# Remove pata & sata hook if root is on hda
|
||||
sed -i "s| pata | |g" /etc/mkinitcpio.conf
|
||||
sed -i "s| sata | |g" /etc/mkinitcpio.conf
|
||||
fi
|
||||
fi
|
||||
mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER.img
|
||||
#
|
||||
# ReInstall grub
|
||||
#
|
||||
grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck
|
||||
#
|
||||
# Rebuild Language
|
||||
#
|
||||
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
|
||||
#
|
||||
# Cleanup Collectd statistics...
|
||||
#
|
||||
PRECLEAN=`du -sh /var/log/rrd/collectd`
|
||||
#
|
||||
rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_count*
|
||||
rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_pagefaults*
|
||||
rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_stacksize*
|
||||
rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_state*
|
||||
rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_vm*
|
||||
#
|
||||
rm -rf /var/log/rrd*/collectd/localhost/interface/if_errors*
|
||||
rm -rf /var/log/rrd*/collectd/localhost/interface/if_packets*
|
||||
#
|
||||
rm -rf /var/log/rrd*/collectd/localhost/disk-*/disk_merged*
|
||||
rm -rf /var/log/rrd*/collectd/localhost/disk-*/disk_ops*
|
||||
rm -rf /var/log/rrd*/collectd/localhost/disk-*/disk_time*
|
||||
#
|
||||
rm -rf /var/log/rrd*/collectd/localhost/iptables-filter-INPUT/*-DROP_Wirelessinput*
|
||||
rm -rf /var/log/rrd*/collectd/localhost/iptables-filter-FORWARD/*-DROP_Wirelessforward*
|
||||
rm -rf /var/log/rrd*/collectd/localhost/iptables-filter-OUTGOINGFW
|
||||
POSTCLEAN=`du -sh /var/log/rrd/collectd`
|
||||
#
|
||||
echo Cleaned up collectd directory from $PRECLEAN to $POSTCLEAN size.
|
||||
#
|
||||
# Start collectd
|
||||
/etc/init.d/collectd start
|
||||
#
|
||||
# Delete old lm-sensor modullist to force search at next boot
|
||||
#
|
||||
rm -rf /etc/sysconfig/lm_sensors
|
||||
#
|
||||
# USB Modeswitch conf now called setup, rename ...
|
||||
#
|
||||
if [ -e /etc/usb_modeswitch.conf ]; then
|
||||
mv -f /etc/usb_modeswitch.conf /etc/usb_modeswitch.setup
|
||||
fi
|
||||
#
|
||||
# rebuild qosscript if enabled...
|
||||
if [ -e /var/ipfire/qos/enable ]; then
|
||||
/usr/local/bin/qosctrl stop
|
||||
/usr/local/bin/qosctrl generate
|
||||
/usr/local/bin/qosctrl start
|
||||
fi
|
||||
#
|
||||
#
|
||||
# convert ipsec.conf from openswan to strongswan...
|
||||
mv /var/ipfire/vpn/ipsec.conf /var/ipfire/vpn/ipsec.conf.org
|
||||
cat /var/ipfire/vpn/ipsec.conf.org | \
|
||||
grep -v "disablearrivalcheck=" | \
|
||||
grep -v "klipsdebug=" | \
|
||||
grep -v "leftfirewall=" | \
|
||||
grep -v "lefthostaccess=" | \
|
||||
grep -v "charonstart=" | \
|
||||
grep -v "aggrmode=" > /var/ipfire/vpn/ipsec.conf
|
||||
sed -i "s|ipsec[0-9]=||g" /var/ipfire/vpn/ipsec.conf
|
||||
sed -i "s|nat_t ||g" /var/ipfire/vpn/ipsec.conf
|
||||
sed -i "s|klips ||g" /var/ipfire/vpn/ipsec.conf
|
||||
sed -i "s|^conn [A-Za-z].*$|&\n\tleftfirewall=yes\n\tlefthostaccess=yes|g" /var/ipfire/vpn/ipsec.conf
|
||||
sed -i "s|^config setup$|&\n\tcharonstart=no|g" /var/ipfire/vpn/ipsec.conf
|
||||
chown nobody:nobody /var/ipfire/vpn/ipsec.conf
|
||||
chmod 644 /var/ipfire/vpn/ipsec.conf
|
||||
#
|
||||
# Add cryptodev to /etc/sysconfig/modules
|
||||
mv /etc/sysconfig/modules /etc/sysconfig/modules.org
|
||||
cat /etc/sysconfig/modules.org | \
|
||||
grep -v "cryptodev" | \
|
||||
grep -v "# End /etc/sysconfig/modules" > /etc/sysconfig/modules
|
||||
echo "" >> /etc/sysconfig/modules
|
||||
echo "### cryptodev" >> /etc/sysconfig/modules
|
||||
echo "#" >> /etc/sysconfig/modules
|
||||
echo "cryptodev" >> /etc/sysconfig/modules
|
||||
echo "" >> /etc/sysconfig/modules
|
||||
echo "# End /etc/sysconfig/modules" >> /etc/sysconfig/modules
|
||||
chmod 644 /etc/sysconfig/modules
|
||||
# Change version of Pakfire.conf
|
||||
#
|
||||
sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf
|
||||
#
|
||||
# After pakfire has ended run it again and update the lists and do upgrade
|
||||
#
|
||||
echo '#!/bin/bash' > /tmp/pak_update
|
||||
echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update
|
||||
echo ' sleep 1' >> /tmp/pak_update
|
||||
echo 'done' >> /tmp/pak_update
|
||||
echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update
|
||||
echo ' sleep 1' >> /tmp/pak_update
|
||||
echo 'done' >> /tmp/pak_update
|
||||
echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update
|
||||
echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
|
||||
echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
|
||||
echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
|
||||
echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update
|
||||
echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Check it before reboot !!!"' >> /tmp/pak_update
|
||||
echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-38 " *** Please reboot... *** "' >> /tmp/pak_update
|
||||
#
|
||||
chmod +x /tmp/pak_update
|
||||
/tmp/pak_update &
|
||||
#
|
||||
# Start squid
|
||||
/etc/init.d/squid start
|
||||
#
|
||||
echo
|
||||
echo Please wait until pakfire has ended...
|
||||
echo
|
||||
@@ -1,2 +0,0 @@
|
||||
etc/ppp/chap-secrets
|
||||
etc/ppp/pap-secrets
|
||||
@@ -1,17 +0,0 @@
|
||||
etc/system-release
|
||||
etc/rc.d/init.d/dnsmasq
|
||||
etc/rc.d/init.d/networking/red
|
||||
etc/rc.d/helper/getdnsfromdhcpc.pl
|
||||
srv/web/ipfire/cgi-bin/pppsetup.cgi
|
||||
usr/local/bin/backupiso
|
||||
usr/local/bin/updxlratorctrl
|
||||
usr/local/bin/urlfilterctrl
|
||||
srv/web/ipfire/cgi-bin/updatexlrator.cgi
|
||||
srv/web/ipfire/cgi-bin/urlfilter.cgi
|
||||
srv/web/ipfire/cgi-bin/ids.cgi
|
||||
srv/web/ipfire/cgi-bin/vpnmain.cgi
|
||||
/opt/pakfire/lib/functions.pl
|
||||
var/ipfire/langs/de.pl
|
||||
var/ipfire/langs/en.pl
|
||||
var/ipfire/langs/es.pl
|
||||
var/ipfire/langs/fr.pl
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/libevent
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/libpng
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/ppp
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/strongswan
|
||||
@@ -1,11 +0,0 @@
|
||||
usr/share/terminfo/s/screen
|
||||
usr/share/terminfo/s/screen-bce
|
||||
usr/share/terminfo/s/screen-s
|
||||
usr/share/terminfo/s/screen-w
|
||||
usr/share/terminfo/s/screen.linux
|
||||
usr/share/terminfo/s/screen.teraterm
|
||||
usr/share/terminfo/s/screen.xterm-new
|
||||
usr/share/terminfo/s/screen.xterm-r6
|
||||
usr/share/terminfo/s/screen.xterm-xfree86
|
||||
usr/share/terminfo/s/screen2
|
||||
usr/share/terminfo/s/screen3
|
||||
@@ -1 +0,0 @@
|
||||
DEPS=""
|
||||
@@ -1,48 +0,0 @@
|
||||
#!/bin/bash
|
||||
############################################################################
|
||||
# #
|
||||
# This file is part of the IPFire Firewall. #
|
||||
# #
|
||||
# IPFire is free software; you can redistribute it and/or modify #
|
||||
# it under the terms of the GNU General Public License as published by #
|
||||
# the Free Software Foundation; either version 3 of the License, or #
|
||||
# (at your option) any later version. #
|
||||
# #
|
||||
# IPFire is distributed in the hope that it will be useful, #
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
|
||||
# GNU General Public License for more details. #
|
||||
# #
|
||||
# You should have received a copy of the GNU General Public License #
|
||||
# along with IPFire; if not, write to the Free Software #
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
||||
# #
|
||||
# Copyright (C) 2010 IPFire-Team <info@ipfire.org>. #
|
||||
# #
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
|
||||
|
||||
# Cleanup crontab
|
||||
cat /var/spool/cron/root.orig | grep -v updatexlrator | grep -v urlfilter > /var/spool/cron/root.orig.temp
|
||||
mv -f /var/spool/cron/root.orig.temp /var/spool/cron/root.orig
|
||||
fcrontab -z
|
||||
|
||||
#
|
||||
#Stop services
|
||||
|
||||
#
|
||||
#Extract files
|
||||
extract_files
|
||||
#
|
||||
#Start services
|
||||
|
||||
#
|
||||
#Update Language cache
|
||||
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
|
||||
|
||||
#
|
||||
#Finish
|
||||
#Don't report the exitcode last command
|
||||
exit 0
|
||||
@@ -1,4 +0,0 @@
|
||||
etc/ipsec.conf
|
||||
etc/ipsec.secrets
|
||||
etc/ipsec.user.conf
|
||||
etc/ipsec.user.secrets
|
||||
@@ -1,224 +0,0 @@
|
||||
lib/modules/2.6.32.15-ipfire/kernel/compat/compat.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/compat/compat_firmware_class.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/ath3k.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/bcm203x.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/bfusb.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/bluecard_cs.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/bpa10x.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/bt3c_cs.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/btmrvl.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/btmrvl_sdio.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/btsdio.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/btuart_cs.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/btusb.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/dtl1_cs.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/hci_uart.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/bluetooth/hci_vhci.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/misc/eeprom/eeprom_93cx6.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/atl1c/atl1c.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/atl1e/atl1e.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/atlx/atl1.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/atlx/atl2.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/b44.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/asix.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/catc.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/cdc-phonet.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/cdc_eem.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/cdc_ether.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/cdc_subset.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/dm9601.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/gl620a.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/hso.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/int51x1.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/kaweth.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/mcs7830.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/net1080.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/pegasus.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/plusb.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/rndis_host.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/rtl8150.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/smsc95xx.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/usbnet.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/usb/zaurus.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/adm8211.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/at76c50x-usb.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ar9170/ar9170usb.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/b43/b43.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ipw2x00/libipw.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/iwlwifi/iwl3945.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/iwlwifi/iwlcore.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas/libertas.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas/libertas_cs.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas/usb8xxx.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/mac80211_hwsim.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/mwl8k.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/orinoco/orinoco.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/p54/p54common.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/p54/p54pci.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/p54/p54usb.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rndis_wlan.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt61pci.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8180.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8187.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/wl12xx/wl1251.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/wl12xx/wl1251_sdio.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/wl12xx/wl1271.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/ssb/ssb.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/bluetooth.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/bnep/bnep.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/cmtp/cmtp.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/hidp/hidp.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/l2cap.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/rfcomm/rfcomm.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/net/bluetooth/sco.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/net/mac80211/mac80211.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/net/wireless/cfg80211.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/net/wireless/lib80211.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/net/wireless/lib80211_crypt_ccmp.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/net/wireless/lib80211_crypt_tkip.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/net/wireless/lib80211_crypt_wep.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/compat/compat.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/compat/compat_firmware_class.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/ath3k.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/bcm203x.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/bfusb.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/bluecard_cs.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/bpa10x.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/bt3c_cs.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/btmrvl.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/btmrvl_sdio.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/btsdio.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/btuart_cs.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/btusb.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/dtl1_cs.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/hci_uart.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/bluetooth/hci_vhci.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/misc/eeprom/eeprom_93cx6.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/atl1c/atl1c.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/atl1e/atl1e.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/atlx/atl1.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/atlx/atl2.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/b44.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/asix.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/catc.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/cdc-phonet.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/cdc_eem.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/cdc_ether.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/cdc_subset.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/dm9601.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/gl620a.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/hso.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/int51x1.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/kaweth.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/mcs7830.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/net1080.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/pegasus.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/plusb.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/rndis_host.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/rtl8150.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/smsc95xx.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/usbnet.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/usb/zaurus.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/adm8211.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/at76c50x-usb.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ar9170/ar9170usb.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/b43/b43.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/libipw.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwl3945.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwlcore.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_cs.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas/usb8xxx.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/mac80211_hwsim.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/mwl8k.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/p54/p54common.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/p54/p54pci.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/p54/p54usb.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rndis_wlan.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt61pci.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8180.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8187.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1251.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1251_sdio.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1271.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/ssb/ssb.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/bluetooth.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/bnep/bnep.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/cmtp/cmtp.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/hidp/hidp.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/l2cap.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/rfcomm/rfcomm.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/net/bluetooth/sco.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/net/mac80211/mac80211.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/net/wireless/cfg80211.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/net/wireless/lib80211.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/net/wireless/lib80211_crypt_ccmp.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/net/wireless/lib80211_crypt_tkip.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/net/wireless/lib80211_crypt_wep.ko
|
||||
etc/udev/rules.d/50-compat_firmware.rules
|
||||
lib/udev/compat_firmware.sh
|
||||
@@ -1,35 +0,0 @@
|
||||
etc/system-release
|
||||
etc/ppp/ip-up
|
||||
var/ipfire/langs/en.pl
|
||||
var/ipfire/langs/de.pl
|
||||
var/ipfire/langs/es.pl
|
||||
var/ipfire/langs/fr.pl
|
||||
var/ipfire/dhcp/dhcpd.conf.local
|
||||
var/ipfire/outgoing/bin/outgoingfw.pl
|
||||
etc/rc.d/init.d/dnsmasq
|
||||
etc/rc.d/init.d/firewall
|
||||
etc/rc.d/init.d/functions
|
||||
etc/rc.d/init.d/networking/red
|
||||
srv/web/ipfire/cgi-bin/backup.cgi
|
||||
srv/web/ipfire/cgi-bin/dhcp.cgi
|
||||
srv/web/ipfire/cgi-bin/ids.cgi
|
||||
srv/web/ipfire/cgi-bin/time.cgi
|
||||
srv/web/ipfire/cgi-bin/pppsetup.cgi
|
||||
srv/web/ipfire/cgi-bin/outgoinggrp.cgi
|
||||
srv/web/ipfire/cgi-bin/outgoingfw.cgi
|
||||
srv/web/ipfire/cgi-bin/qos.cgi
|
||||
usr/lib/python2.7/ipaddr.pyc
|
||||
usr/lib/python2.7/site-packages/drv_libxml2.py
|
||||
usr/lib/python2.7/site-packages/libxml2.py
|
||||
usr/lib/python2.7/site-packages/libxml2mod.so
|
||||
usr/lib/python2.7/site-packages/libxml2.pyc
|
||||
usr/lib/python2.7/site-packages/libxsltmod.so
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/usb/serial/option.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/usb/serial/option.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/usb/serial/usbserial.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/usb/serial/usbserial.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/igb/igb.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/igb/igb.ko.org
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/igb/igb.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/igb/igb.ko.org
|
||||
usr/sbin/openvpn
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/mkinitcpio
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/python
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/snort
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/strongswan
|
||||
@@ -1 +0,0 @@
|
||||
DEPS=""
|
||||
@@ -1,62 +0,0 @@
|
||||
#!/bin/bash
|
||||
############################################################################
|
||||
# #
|
||||
# This file is part of the IPFire Firewall. #
|
||||
# #
|
||||
# IPFire is free software; you can redistribute it and/or modify #
|
||||
# it under the terms of the GNU General Public License as published by #
|
||||
# the Free Software Foundation; either version 3 of the License, or #
|
||||
# (at your option) any later version. #
|
||||
# #
|
||||
# IPFire is distributed in the hope that it will be useful, #
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
|
||||
# GNU General Public License for more details. #
|
||||
# #
|
||||
# You should have received a copy of the GNU General Public License #
|
||||
# along with IPFire; if not, write to the Free Software #
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
||||
# #
|
||||
# Copyright (C) 2010 IPFire-Team <info@ipfire.org>. #
|
||||
# #
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
|
||||
|
||||
#
|
||||
#Stop services
|
||||
/usr/local/bin/openvpnctrl -k
|
||||
#
|
||||
#Extract files
|
||||
extract_files
|
||||
#
|
||||
#Remove old python files...
|
||||
rm -rf /usr/lib/python2.4
|
||||
|
||||
#
|
||||
#Start services
|
||||
/usr/local/bin/openvpnctrl -s
|
||||
|
||||
#
|
||||
#Update Language cache
|
||||
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
|
||||
|
||||
# Change var lock size to 8MB
|
||||
grep -v "/var/lock" /etc/fstab > /tmp/fstab.tmp
|
||||
mv /tmp/fstab.tmp /etc/fstab
|
||||
echo none /var/lock tmpfs defaults,size=8M 0 0 >> /etc/fstab
|
||||
|
||||
|
||||
#Rebuild module dep's
|
||||
depmod 2.6.32.15-ipfire
|
||||
depmod 2.6.32.15-ipfire-xen
|
||||
|
||||
#Create the misssing mac group
|
||||
mkdir /var/ipfire/outgoing/macgroups
|
||||
chown nobody.nobody /var/ipfire/outgoing/macgroups
|
||||
|
||||
#
|
||||
#Finish
|
||||
#Don't report the exitcode last command
|
||||
exit 0
|
||||
@@ -1,4 +0,0 @@
|
||||
etc/ipsec.conf
|
||||
etc/ipsec.secrets
|
||||
etc/ipsec.user.conf
|
||||
etc/ipsec.user.secrets
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/bzip2
|
||||
@@ -1,12 +0,0 @@
|
||||
etc/system-release
|
||||
etc/rc.d/init.d/firewall
|
||||
srv/web/ipfire/cgi-bin/outgoinggrp.cgi
|
||||
srv/web/ipfire/cgi-bin/outgoingfw.cgi
|
||||
srv/web/ipfire/cgi-bin/urlfilter.cgi
|
||||
srv/web/ipfire/cgi-bin/vpnmain.cgi
|
||||
var/ipfire/langs/en.pl
|
||||
var/ipfire/langs/de.pl
|
||||
var/ipfire/langs/es.pl
|
||||
var/ipfire/langs/fr.pl
|
||||
var/ipfire/outgoing/bin/outgoingfw.pl
|
||||
usr/local/sbin/setup
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/glibc
|
||||
@@ -1,6 +0,0 @@
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/r8101.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/r8168.ko
|
||||
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/r8169.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/r8101.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/r8168.ko
|
||||
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/r8169.ko
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/strongswan
|
||||
@@ -1 +0,0 @@
|
||||
DEPS=""
|
||||
@@ -1,57 +0,0 @@
|
||||
#!/bin/bash
|
||||
############################################################################
|
||||
# #
|
||||
# This file is part of the IPFire Firewall. #
|
||||
# #
|
||||
# IPFire is free software; you can redistribute it and/or modify #
|
||||
# it under the terms of the GNU General Public License as published by #
|
||||
# the Free Software Foundation; either version 3 of the License, or #
|
||||
# (at your option) any later version. #
|
||||
# #
|
||||
# IPFire is distributed in the hope that it will be useful, #
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
|
||||
# GNU General Public License for more details. #
|
||||
# #
|
||||
# You should have received a copy of the GNU General Public License #
|
||||
# along with IPFire; if not, write to the Free Software #
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
||||
# #
|
||||
# Copyright (C) 2010 IPFire-Team <info@ipfire.org>. #
|
||||
# #
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
|
||||
|
||||
#
|
||||
#Stop services
|
||||
/etc/init.d/ipsec stop
|
||||
|
||||
#Remove old bzip2 files
|
||||
rm -f /usr/local/bin/bunzip2
|
||||
rm -f /usr/local/bin/bzcat
|
||||
rm -f /usr/local/bin/bzip2
|
||||
rm -f /usr/local/include/bzlib.h
|
||||
rm -f /usr/local/lib/libbz2.a
|
||||
|
||||
#
|
||||
#Extract files
|
||||
extract_files
|
||||
|
||||
#
|
||||
#Start services
|
||||
/etc/init.d/ipsec start
|
||||
|
||||
#
|
||||
#Update Language cache
|
||||
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
|
||||
|
||||
#Rebuild module dep's
|
||||
depmod 2.6.32.15-ipfire
|
||||
depmod 2.6.32.15-ipfire-xen
|
||||
|
||||
#
|
||||
#Finish
|
||||
#Don't report the exitcode last command
|
||||
exit 0
|
||||
@@ -1,3 +0,0 @@
|
||||
etc/system-release
|
||||
srv/web/ipfire/html/images/urlfilter/copy.gif
|
||||
srv/web/ipfire/cgi-bin/ids.cgi
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/openssh
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/openssl
|
||||
@@ -1 +0,0 @@
|
||||
DEPS=""
|
||||
@@ -1,48 +0,0 @@
|
||||
#!/bin/bash
|
||||
############################################################################
|
||||
# #
|
||||
# This file is part of the IPFire Firewall. #
|
||||
# #
|
||||
# IPFire is free software; you can redistribute it and/or modify #
|
||||
# it under the terms of the GNU General Public License as published by #
|
||||
# the Free Software Foundation; either version 3 of the License, or #
|
||||
# (at your option) any later version. #
|
||||
# #
|
||||
# IPFire is distributed in the hope that it will be useful, #
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
|
||||
# GNU General Public License for more details. #
|
||||
# #
|
||||
# You should have received a copy of the GNU General Public License #
|
||||
# along with IPFire; if not, write to the Free Software #
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
||||
# #
|
||||
# Copyright (C) 2010 IPFire-Team <info@ipfire.org>. #
|
||||
# #
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
|
||||
|
||||
#
|
||||
#Stop services
|
||||
|
||||
#
|
||||
#Extract files
|
||||
extract_files
|
||||
|
||||
#
|
||||
#Start services
|
||||
|
||||
#
|
||||
#Update Language cache
|
||||
#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
|
||||
|
||||
#Rebuild module dep's
|
||||
#depmod 2.6.32.15-ipfire
|
||||
#depmod 2.6.32.15-ipfire-xen
|
||||
|
||||
#
|
||||
#Finish
|
||||
#Don't report the exitcode last command
|
||||
exit 0
|
||||
@@ -0,0 +1,6 @@
|
||||
etc/udev/rules.d/30-persistent-network.rules
|
||||
etc/ipsec.conf
|
||||
etc/ipsec.secrets
|
||||
etc/ipsec.user.conf
|
||||
etc/ipsec.user.secrets
|
||||
var/updatecache
|
||||
|
||||
1
config/rootfiles/core/43/filelists/apache2
Symbolic link
1
config/rootfiles/core/43/filelists/apache2
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/apache2
|
||||
1
config/rootfiles/core/43/filelists/attr
Symbolic link
1
config/rootfiles/core/43/filelists/attr
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/attr
|
||||
1
config/rootfiles/core/43/filelists/cpio
Symbolic link
1
config/rootfiles/core/43/filelists/cpio
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/cpio
|
||||
1
config/rootfiles/core/43/filelists/dnsmasq
Symbolic link
1
config/rootfiles/core/43/filelists/dnsmasq
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/dnsmasq
|
||||
1
config/rootfiles/core/43/filelists/dracut
Symbolic link
1
config/rootfiles/core/43/filelists/dracut
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/dracut
|
||||
@@ -1,2 +1,12 @@
|
||||
etc/init.d/firewall
|
||||
etc/system-release
|
||||
etc/rc.d/init.d/checkfs
|
||||
etc/rc.d/init.d/checkfstab
|
||||
etc/rc.d/init.d/squid
|
||||
srv/web/ipfire/cgi-bin/proxy.cgi
|
||||
srv/web/ipfire/cgi-bin/speed.cgi
|
||||
srv/web/ipfire/cgi-bin/vpnmain.cgi
|
||||
srv/web/ipfire/html/images/urlfilter/copy.gif
|
||||
var/ipfire/general-functions.pl
|
||||
usr/local/bin/rebuild-initrd
|
||||
usr/bin/ldd
|
||||
|
||||
1
config/rootfiles/core/43/filelists/findutils
Symbolic link
1
config/rootfiles/core/43/filelists/findutils
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/findutils
|
||||
1
config/rootfiles/core/43/filelists/iw
Symbolic link
1
config/rootfiles/core/43/filelists/iw
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/iw
|
||||
1
config/rootfiles/core/43/filelists/libcap
Symbolic link
1
config/rootfiles/core/43/filelists/libcap
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/libcap
|
||||
1
config/rootfiles/core/43/filelists/squid
Symbolic link
1
config/rootfiles/core/43/filelists/squid
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/squid
|
||||
1
config/rootfiles/core/43/filelists/tcl
Symbolic link
1
config/rootfiles/core/43/filelists/tcl
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/tcl
|
||||
1
config/rootfiles/core/43/filelists/udev
Symbolic link
1
config/rootfiles/core/43/filelists/udev
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/udev
|
||||
1
config/rootfiles/core/43/filelists/usb_modeswitch_data
Symbolic link
1
config/rootfiles/core/43/filelists/usb_modeswitch_data
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/usb_modeswitch_data
|
||||
1
config/rootfiles/core/43/filelists/wireless
Symbolic link
1
config/rootfiles/core/43/filelists/wireless
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/wireless
|
||||
1
config/rootfiles/core/43/filelists/wpa_supplicant
Symbolic link
1
config/rootfiles/core/43/filelists/wpa_supplicant
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/wpa_supplicant
|
||||
@@ -23,26 +23,181 @@
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
|
||||
#
|
||||
KVER="2.6.32.26"
|
||||
MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
|
||||
# Nur den letzten Parameter verwenden
|
||||
echo $MOUNT > /dev/null
|
||||
MOUNT=$_
|
||||
if [ ! $MOUNT == "rw" ]; then
|
||||
MOUNT="ro"
|
||||
fi
|
||||
|
||||
|
||||
#
|
||||
#Stop services
|
||||
# check if we the backup file already exist
|
||||
if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then
|
||||
echo Moving backup to backup-old ...
|
||||
mv -f /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \
|
||||
/var/ipfire/backup/core-upgrade_$KVER-old.tar.bz2
|
||||
fi
|
||||
echo First we made a backup of all files that was inside of the
|
||||
echo update archive. This may take a while ...
|
||||
# Add some files that are not in the package to backup
|
||||
echo lib/modules >> /opt/pakfire/tmp/ROOTFILES
|
||||
echo boot >> /opt/pakfire/tmp/ROOTFILES
|
||||
echo etc/mkinitcpio.conf >> /opt/pakfire/tmp/ROOTFILES
|
||||
echo etc/mkinitcpio.conf.org >> /opt/pakfire/tmp/ROOTFILES
|
||||
echo etc/mkinitcpio.d >> /opt/pakfire/tmp/ROOTFILES
|
||||
echo lib/initcpio >> /opt/pakfire/tmp/ROOTFILES
|
||||
echo sbin/mkinitcpio >> /opt/pakfire/tmp/ROOTFILES
|
||||
echo usr/bin/iw >> /opt/pakfire/tmp/ROOTFILES
|
||||
|
||||
# Backup the files
|
||||
tar cjvf /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \
|
||||
-C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' > /dev/null 2>&1
|
||||
|
||||
echo
|
||||
echo Update Kernel to $KVER ...
|
||||
# Remove old kernel, configs, initrd, modules ...
|
||||
#
|
||||
rm -rf /boot/System.map-*
|
||||
rm -rf /boot/config-*
|
||||
rm -rf /boot/ipfirerd-*
|
||||
rm -rf /boot/vmlinuz-*
|
||||
rm -rf /lib/modules/*-ipfire
|
||||
# Remove mkinitcpio
|
||||
rm -rf /etc/mkinitcpio.*
|
||||
rm -rf /lib/initcpio
|
||||
rm -rf /sbin/mkinitcpio
|
||||
# Remove old iw (new is in usr/sbin)
|
||||
rm -rf /usr/bin/iw
|
||||
#
|
||||
# Backup grub.conf
|
||||
#
|
||||
cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org
|
||||
#
|
||||
# Unpack the updated files
|
||||
#
|
||||
echo
|
||||
echo Unpack the updated files ...
|
||||
#
|
||||
tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
|
||||
--no-overwrite-dir
|
||||
|
||||
#
|
||||
#Extract files
|
||||
extract_files
|
||||
# Stop services to save memory
|
||||
#
|
||||
/etc/init.d/snort stop
|
||||
/etc/init.d/squid stop
|
||||
|
||||
# Convert /etc/fstab entries to UUID ...
|
||||
#
|
||||
echo Convert fstab entries to UUID ...
|
||||
ROOT=`mount | grep " / " | cut -d" " -f1`
|
||||
BOOT=`mount | grep " /boot " | cut -d" " -f1`
|
||||
VAR=`mount | grep " /var " | cut -d" " -f1`
|
||||
SWAP=`grep "/dev/" /proc/swaps | cut -d" " -f1`
|
||||
#
|
||||
|
||||
if [ ! -z $ROOT ]; then
|
||||
ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2`
|
||||
if [ ! -z $ROOTUUID ]; then
|
||||
sed -i "s|^$ROOT|UUID=$ROOTUUID|g" /etc/fstab
|
||||
#else
|
||||
#to do add uuid to rootfs
|
||||
fi
|
||||
else
|
||||
echo "ERROR! / not found!!!"
|
||||
fi
|
||||
|
||||
if [ ! -z $BOOT ]; then
|
||||
BOOTUUID=`blkid -c /dev/null -sUUID $BOOT | cut -d'"' -f2`
|
||||
if [ ! -z $BOOTUUID ]; then
|
||||
sed -i "s|^$BOOT|UUID=$BOOTUUID|g" /etc/fstab
|
||||
#else
|
||||
#to do add uuid to bootfs
|
||||
fi
|
||||
else
|
||||
echo "WARNING! /boot not found!!!"
|
||||
fi
|
||||
|
||||
if [ ! -z $VAR ]; then
|
||||
VARUUID=`blkid -c /dev/null -sUUID $VAR | cut -d'"' -f2`
|
||||
if [ ! -z $VARUUID ]; then
|
||||
sed -i "s|^$VAR|UUID=$VARUUID|g" /etc/fstab
|
||||
#else
|
||||
#to do add uuid to varfs
|
||||
fi
|
||||
else
|
||||
echo "WARNING! /var not found!!!"
|
||||
fi
|
||||
|
||||
if [ ! -z $SWAP ]; then
|
||||
SWAPUUID=`blkid -c /dev/null -sUUID $SWAP | cut -d'"' -f2`
|
||||
if [ ! -z $SWAPUUID ]; then
|
||||
sed -i "s|^$SWAP|UUID=$SWAPUUID|g" /etc/fstab
|
||||
else
|
||||
# Reformat swap to add a UUID
|
||||
swapoff -a
|
||||
mkswap $SWAP
|
||||
swapon -a
|
||||
SWAPUUID=`blkid -c /dev/null -sUUID $SWAP | cut -d'"' -f2`
|
||||
if [ ! -z $SWAPUUID ]; then
|
||||
sed -i "s|^$SWAP|UUID=$SWAPUUID|g" /etc/fstab
|
||||
fi
|
||||
fi
|
||||
else
|
||||
echo "WARNING! swap not found!!!"
|
||||
fi
|
||||
|
||||
#
|
||||
#Start services
|
||||
# Start services
|
||||
#
|
||||
/etc/init.d/squid start
|
||||
/etc/init.d/snort start
|
||||
|
||||
#
|
||||
#Update Language cache
|
||||
#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
|
||||
|
||||
#Rebuild module dep's
|
||||
#depmod 2.6.32.15-ipfire
|
||||
#depmod 2.6.32.15-ipfire-xen
|
||||
|
||||
# Modify grub.conf
|
||||
#
|
||||
#Finish
|
||||
#Don't report the exitcode last command
|
||||
exit 0
|
||||
echo
|
||||
echo Update grub configuration ...
|
||||
if [ ! -z $ROOTUUID ]; then
|
||||
sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf
|
||||
else
|
||||
sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf
|
||||
fi
|
||||
sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf
|
||||
sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf
|
||||
|
||||
if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then
|
||||
echo "grub use default console ..."
|
||||
else
|
||||
echo "grub use serial console ..."
|
||||
sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf
|
||||
sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf
|
||||
sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf
|
||||
sed -i -e "s| panic=10 | console=ttyS0,38400n8 panic=10 |g" /boot/grub/grub.conf
|
||||
fi
|
||||
#
|
||||
# Change /dev/hd? to /dev/sda
|
||||
#
|
||||
if [ "${ROOT:0:7}" == "/dev/hd" ];then
|
||||
sed -i -e "s|${ROOT:0:8}|/dev/sda|g" /boot/grub/grub.conf
|
||||
sed -i -e "s|${ROOT:0:8}|/dev/sda|g" /etc/fstab
|
||||
fi
|
||||
#
|
||||
# ReInstall grub
|
||||
#
|
||||
grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck
|
||||
#
|
||||
# Rebuild Language
|
||||
#
|
||||
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
|
||||
#
|
||||
# Delete old lm-sensor modullist to force search at next boot
|
||||
#
|
||||
rm -rf /etc/sysconfig/lm_sensors
|
||||
/usr/bin/logger -p syslog.emerg -t kernel "Upgrade finished. If you use a customized grub.cfg"
|
||||
/usr/bin/logger -p syslog.emerg -t kernel "Check it before reboot !!!"
|
||||
/usr/bin/logger -p syslog.emerg -t kernel " *** Please reboot... *** "
|
||||
|
||||
Reference in New Issue
Block a user