mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-28 11:43:25 +02:00
Merge branch 'next'
Conflicts: lfs/e1000 lfs/e1000e lfs/igb lfs/lcd4linux
This commit is contained in:
Arne Fitzenreiter
@@ -1 +0,0 @@
|
||||
srv/web/ipfire/html/proxy.pac
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/MIME-Tools
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/Mail-Tools
|
||||
@@ -1,22 +0,0 @@
|
||||
etc/system-release
|
||||
etc/httpd/conf/server-tuning.conf
|
||||
etc/rc.d/init.d/squid
|
||||
etc/rc.d/init.d/waitdrives
|
||||
etc/rc.d/rcsysinit.d/S19waitdrives
|
||||
var/ipfire/backup/bin/backup.pl
|
||||
srv/web/ipfire/cgi-bin/backup.cgi
|
||||
srv/web/ipfire/cgi-bin/extrahd.cgi
|
||||
srv/web/ipfire/cgi-bin/ids.cgi
|
||||
srv/web/ipfire/cgi-bin/logs.cgi/log.dat
|
||||
srv/web/ipfire/cgi-bin/ovpnmain.cgi
|
||||
srv/web/ipfire/cgi-bin/pppsetup.cgi
|
||||
srv/web/ipfire/cgi-bin/proxy.cgi
|
||||
srv/web/ipfire/cgi-bin/qos.cgi
|
||||
srv/web/ipfire/cgi-bin/services.cgi
|
||||
srv/web/ipfire/cgi-bin/vpnmain.cgi
|
||||
var/ipfire/langs/de.pl
|
||||
var/ipfire/langs/en.pl
|
||||
var/ipfire/langs/es.pl
|
||||
var/ipfire/langs/fr.pl
|
||||
var/ipfire/menu.d/20-status.menu
|
||||
usr/local/bin/scanhd
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/lm_sensors
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/ntfs-3g
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/perl-GD
|
||||
@@ -1 +0,0 @@
|
||||
DEPS=""
|
||||
@@ -1,59 +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) 2011 IPFire-Team <info@ipfire.org>. #
|
||||
# #
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
|
||||
|
||||
#
|
||||
# Remove old core updates from pakfire cache to save space...
|
||||
core=49
|
||||
for (( i=1; i<=$core; i++ ))
|
||||
do
|
||||
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
|
||||
done
|
||||
|
||||
#
|
||||
#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.28-ipfire >/dev/null 2>&1
|
||||
#depmod 2.6.32.28-ipfire-pae >/dev/null 2>&1
|
||||
#depmod 2.6.32.28-ipfire-xen >/dev/null 2>&1
|
||||
|
||||
#
|
||||
#Finish
|
||||
/etc/init.d/fireinfo start
|
||||
sendprofile
|
||||
#Don't report the exitcode last command
|
||||
exit 0
|
||||
@@ -1,3 +0,0 @@
|
||||
srv/web/ipfire/html/proxy.pac
|
||||
var/updatecache
|
||||
etc/collectd.custom
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/apache2
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/collectd
|
||||
@@ -1,11 +0,0 @@
|
||||
etc/sysctl.conf
|
||||
etc/system-release
|
||||
var/ipfire/langs/
|
||||
etc/rc.d/init.d/console
|
||||
usr/local/sbin/setup
|
||||
var/ipfire/graphs.pl
|
||||
srv/web/ipfire/cgi-bin/portfw.cgi
|
||||
srv/web/ipfire/cgi-bin/logs.cgi/log.dat
|
||||
usr/local/share/GeoIP/GeoIP.dat
|
||||
usr/share/hwdata/pci.ids
|
||||
usr/share/hwdata/usb.ids
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/gettext
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/python
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/smartmontools
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/squid
|
||||
@@ -1 +0,0 @@
|
||||
DEPS=""
|
||||
@@ -1,64 +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) 2011 IPFire-Team <info@ipfire.org>. #
|
||||
# #
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
|
||||
|
||||
#
|
||||
# Remove old core updates from pakfire cache to save space...
|
||||
core=50
|
||||
for (( i=1; i<=$core; i++ ))
|
||||
do
|
||||
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
|
||||
done
|
||||
|
||||
#
|
||||
#Stop services
|
||||
/etc/init.d/apache stop
|
||||
/etc/init.d/collectd stop
|
||||
/etc/init.d/squid stop
|
||||
#
|
||||
#Extract files
|
||||
extract_files
|
||||
|
||||
#
|
||||
#Start services
|
||||
/etc/init.d/squid start
|
||||
/etc/init.d/collectd start
|
||||
/etc/init.d/apache start
|
||||
|
||||
#
|
||||
#Update Language cache
|
||||
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
|
||||
|
||||
#Rebuild module dep's
|
||||
#depmod 2.6.32.28-ipfire >/dev/null 2>&1
|
||||
#depmod 2.6.32.28-ipfire-pae >/dev/null 2>&1
|
||||
#depmod 2.6.32.28-ipfire-xen >/dev/null 2>&1
|
||||
|
||||
#
|
||||
#Finish
|
||||
/etc/init.d/fireinfo start
|
||||
sendprofile
|
||||
#Don't report the exitcode last command
|
||||
exit 0
|
||||
@@ -1 +0,0 @@
|
||||
srv/web/ipfire/html/proxy.pac
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/crda
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/dhcp
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/dracut
|
||||
@@ -1,4 +0,0 @@
|
||||
etc/system-release
|
||||
etc/sysctl.conf
|
||||
var/ipfire/langs/
|
||||
var/ipfire/proxy/advanced/useragents
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/grub
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/iw
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/linux
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/linux-firmware
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/wireless-regdb
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/zd1211-firmware
|
||||
@@ -1 +0,0 @@
|
||||
DEPS=""
|
||||
@@ -1,171 +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) 2011 IPFire-Team <info@ipfire.org>. #
|
||||
# #
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
|
||||
|
||||
#
|
||||
# Remove old core updates from pakfire cache to save space...
|
||||
core=51
|
||||
for (( i=1; i<=$core; i++ ))
|
||||
do
|
||||
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
|
||||
done
|
||||
|
||||
#
|
||||
KVER="xxxKVERxxx"
|
||||
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
|
||||
|
||||
|
||||
#
|
||||
# erase old backups to prefent disk-full on small installations
|
||||
rm -f /var/ipfire/backup/core-upgrade_*.tar.bz2
|
||||
|
||||
#
|
||||
# backup
|
||||
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
|
||||
|
||||
# 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/*
|
||||
#
|
||||
# Backup grub.conf
|
||||
#
|
||||
cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org
|
||||
|
||||
#
|
||||
# Stop services to save memory
|
||||
#
|
||||
/etc/init.d/snort stop
|
||||
/etc/init.d/squid stop
|
||||
/etc/init.d/ipsec stop
|
||||
/etc/init.d/dhcp stop
|
||||
#
|
||||
# Unpack the updated files
|
||||
#
|
||||
echo
|
||||
echo Unpack the updated files ...
|
||||
#
|
||||
tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
|
||||
--no-overwrite-dir
|
||||
|
||||
#
|
||||
# Enable ralink rt73 hardware encryption again
|
||||
rm -f /etc/modprobe.d/ralink_wireless
|
||||
|
||||
#
|
||||
# Start services
|
||||
#
|
||||
/etc/init.d/dhcp start
|
||||
/etc/init.d/squid start
|
||||
/etc/init.d/snort start
|
||||
if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
|
||||
/etc/init.d/ipsec start
|
||||
fi
|
||||
|
||||
|
||||
#
|
||||
# Modify grub.conf
|
||||
#
|
||||
echo
|
||||
echo Update grub configuration ...
|
||||
ROOT=`mount | grep " / " | cut -d" " -f1`
|
||||
if [ ! -z $ROOT ]; then
|
||||
ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2`
|
||||
fi
|
||||
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
|
||||
#
|
||||
# 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
|
||||
|
||||
# Ensure that all data was written...
|
||||
sync
|
||||
sync
|
||||
sync
|
||||
|
||||
# Reboot message to console
|
||||
/usr/bin/logger -p syslog.emerg -t core-upgrade-51 "Upgrade finished. If you use a customized grub.cfg"
|
||||
/usr/bin/logger -p syslog.emerg -t core-upgrade-51 "Check it before reboot !!!"
|
||||
/usr/bin/logger -p syslog.emerg -t core-upgrade-51 " *** Please reboot... *** "
|
||||
|
||||
# This update need a reboot.
|
||||
touch /var/run/need_reboot
|
||||
|
||||
#
|
||||
#Finish
|
||||
/etc/init.d/fireinfo start
|
||||
sendprofile
|
||||
|
||||
# Ensure that all data was written...
|
||||
sync
|
||||
sync
|
||||
sync
|
||||
|
||||
#
|
||||
#Don't report the exitcode last command
|
||||
exit 0
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/gcc
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/glibc
|
||||
1
config/rootfiles/core/53/filelists/i586/gcc
Symbolic link
1
config/rootfiles/core/53/filelists/i586/gcc
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/i586/gcc
|
||||
1
config/rootfiles/core/53/filelists/i586/glibc
Symbolic link
1
config/rootfiles/core/53/filelists/i586/glibc
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/i586/glibc
|
||||
Reference in New Issue
Block a user