webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
Conflicts:
	config/kernel/kernel.config.i586-ipfire-pae
	config/rootfiles/core/45/meta
	config/rootfiles/core/46/meta
	config/rootfiles/core/47/meta
	config/rootfiles/core/48/meta
	config/rootfiles/core/52/meta
	config/rootfiles/oldcore/44/meta
	config/rootfiles/oldcore/45/meta
	config/rootfiles/oldcore/46/meta
	config/rootfiles/oldcore/47/meta
	doc/language_missings
	langs/pl/cgi-bin/pl.pl
	make.sh
This commit is contained in:
Arne Fitzenreiter
2011-07-26 08:12:05 +02:00
parent cffed7aa4b 67a1b5b843
commit 8c4f3d176b
48 changed files with 1055 additions and 681 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
config/rootfiles/core/50/filelists/icons
View File

@@ -1,13 +0,0 @@
srv/web/ipfire/html/images/delete.gif
srv/web/ipfire/html/images/document-save.png
srv/web/ipfire/html/images/edit.gif
srv/web/ipfire/html/images/floppy.gif
srv/web/ipfire/html/images/forward.gif
srv/web/ipfire/html/images/info.gif
srv/web/ipfire/html/images/list-add.png
srv/web/ipfire/html/images/list-remove.png
srv/web/ipfire/html/images/package-x-generic.png
srv/web/ipfire/html/images/reload.gif
srv/web/ipfire/html/images/stock_ok.png
srv/web/ipfire/html/images/stock_stop.png
srv/web/ipfire/html/images/user-trash.png

1
config/rootfiles/core/51/exclude Normal file
View File

@@ -0,0 +1 @@
srv/web/ipfire/html/proxy.pac

1
config/rootfiles/core/51/filelists/crda Symbolic link
View File

@@ -0,0 +1 @@
../../../common/crda

1
config/rootfiles/core/51/filelists/dracut Symbolic link
View File

@@ -0,0 +1 @@
../../../common/dracut

2
config/rootfiles/core/51/filelists/files Normal file
View File

@@ -0,0 +1,2 @@
etc/system-release
var/ipfire/langs/

1
config/rootfiles/core/51/filelists/grub Symbolic link
View File

@@ -0,0 +1 @@
../../../common/grub

1
config/rootfiles/core/51/filelists/iw Symbolic link
View File

@@ -0,0 +1 @@
../../../common/iw

1
config/rootfiles/core/51/filelists/linux Symbolic link
View File

@@ -0,0 +1 @@
../../../common/linux

1
config/rootfiles/core/51/filelists/linux-firmware Symbolic link
View File

@@ -0,0 +1 @@
../../../common/linux-firmware

1
config/rootfiles/core/51/filelists/wireless-regdb Symbolic link
View File

@@ -0,0 +1 @@
../../../common/wireless-regdb

1
config/rootfiles/core/51/filelists/zd1211-firmware Symbolic link
View File

@@ -0,0 +1 @@
../../../common/zd1211-firmware

1
config/rootfiles/core/51/meta Normal file
View File

@@ -0,0 +1 @@
DEPS=""

158
config/rootfiles/core/51/update.sh Normal file
View File

@@ -0,0 +1,158 @@
#!/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
#
# 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
# 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
#
# 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/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
# 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
#Don't report the exitcode last command
exit 0

1
config/rootfiles/core/52/exclude Normal file
View File

@@ -0,0 +1 @@
srv/web/ipfire/html/proxy.pac

2
config/rootfiles/core/52/filelists/files Normal file
View File

@@ -0,0 +1,2 @@
etc/system-release
var/ipfire/langs/

1
config/rootfiles/core/52/meta Normal file
View File

@@ -0,0 +1 @@
DEPS=""

59
config/rootfiles/core/52/update.sh Normal file
View File

@@ -0,0 +1,59 @@
#!/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=52
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.43-ipfire >/dev/null 2>&1
#depmod 2.6.32.43-ipfire-pae >/dev/null 2>&1
#depmod 2.6.32.43-ipfire-xen >/dev/null 2>&1
#
#Finish
/etc/init.d/fireinfo start
sendprofile
#Don't report the exitcode last command
exit 0