mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-23 17:32:57 +02:00
Updater.sh added
add grup.conf to updater package removed beginning / in vnstat(i) rootfile reverted ffmpeg changes because videolan doesnt compile with the libs
This commit is contained in:
Arne Fitzenreiter
@@ -1,6 +1,6 @@
|
||||
#/etc/cron.d
|
||||
#/etc/cron.d/vnstat
|
||||
/etc/vnstat.conf
|
||||
/usr/bin/vnstat
|
||||
etc/vnstat.conf
|
||||
usr/bin/vnstat
|
||||
#usr/share/man/man1/vnstat.1
|
||||
/var/log/vnstat
|
||||
var/log/vnstat
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
/usr/bin/vnstati
|
||||
usr/bin/vnstati
|
||||
#usr/share/man/man1/vnstati.1.gz
|
||||
|
||||
1
config/rootfiles/updater/filelists/grub
Normal file
1
config/rootfiles/updater/filelists/grub
Normal file
@@ -0,0 +1 @@
|
||||
boot/grub/grub.conf
|
||||
@@ -1,6 +1,6 @@
|
||||
#/etc/cron.d
|
||||
#/etc/cron.d/vnstat
|
||||
/etc/vnstat.conf
|
||||
/usr/bin/vnstat
|
||||
etc/vnstat.conf
|
||||
usr/bin/vnstat
|
||||
#usr/share/man/man1/vnstat.1
|
||||
/var/log/vnstat
|
||||
var/log/vnstat
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
/usr/bin/vnstati
|
||||
usr/bin/vnstati
|
||||
#usr/share/man/man1/vnstati.1.gz
|
||||
|
||||
110
config/rootfiles/updater/update.sh
Normal file → Executable file
110
config/rootfiles/updater/update.sh
Normal file → Executable file
@@ -1,3 +1,111 @@
|
||||
#!/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 2 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) 2007 IPFire-Team <info@ipfire.org>. #
|
||||
# #
|
||||
############################################################################
|
||||
#
|
||||
# update.sh is not finished yet ...
|
||||
#
|
||||
OLDVERSION="2.1.1"
|
||||
NEWVERSION="2.2-test"
|
||||
CORE="14"
|
||||
KVER="2.6.20.21"
|
||||
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=$_
|
||||
INSTALLEDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2`
|
||||
INSTALLEDCORE=`cat /opt/pakfire/db/core/mine`
|
||||
#
|
||||
# check version
|
||||
#
|
||||
if [ ! "$INSTALLEDVERSION" == "$OLDVERSION" ]; then
|
||||
echo Error! This update is only for IPfire $OLDVERSION CORE $CORE
|
||||
echo You have installed IPfire $INSTALLEDVERSION CORE $INSTALLEDCORE
|
||||
exit 1
|
||||
fi
|
||||
# check core
|
||||
if [ ! "$INSTALLEDCORE" == "$CORE" ]; then
|
||||
echo Error! This update is only for IPfire $OLDVERSION CORE $CORE
|
||||
echo You have installed IPfire $INSTALLEDVERSION CORE $INSTALLEDCORE
|
||||
exit 2
|
||||
fi
|
||||
#
|
||||
#
|
||||
echo
|
||||
echo Update IPfire $OLDVERSION to $NEWVERSION
|
||||
echo
|
||||
echo Press Enter to begin.
|
||||
read
|
||||
echo
|
||||
#
|
||||
# check if we the backup file already exist
|
||||
if [ -e /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.bz2 ]; then
|
||||
echo Error! The backupfile of this update already exist!!!
|
||||
echo Have you already installed this update?
|
||||
exit 3
|
||||
fi
|
||||
echo First we made a backup of all files that was inside of the
|
||||
echo update archive. This may take a while ...
|
||||
tar cjvf /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.bz2 \
|
||||
-T ROOTFILES --exclude='#*' -C / > /dev/null 2>&1
|
||||
echo
|
||||
echo Update IPfire to $NEWVERSON ...
|
||||
#
|
||||
# Backup the old grub config
|
||||
#
|
||||
mv /boot/grub/grub.conf /boot/grub/grub-old.conf
|
||||
#
|
||||
# Unpack the updated files
|
||||
#
|
||||
echo
|
||||
echo Unpack the updated files ...
|
||||
tar xjvf files.ipfire -C /
|
||||
#
|
||||
# Modify grub.conf
|
||||
#
|
||||
echo Update grub configuration ...
|
||||
sed -i "s|MOUNT|$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
|
||||
echo "title Old Kernel" >> /boot/grub/grub.conf
|
||||
echo " configfile /grub/grub-old.conf" >> /boot/grub/grub.conf
|
||||
#
|
||||
# Made initramdisk
|
||||
#
|
||||
echo Create new Initramdisks ...
|
||||
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 hook if root is on hda
|
||||
sed -i "s| pata | |g" /etc/mkinitcpio.conf
|
||||
fi
|
||||
fi
|
||||
mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER.img
|
||||
mkinitcpio -k $KVER-ipfire-smp -g /boot/ipfirerd-$KVER-smp.img
|
||||
#
|
||||
# Change version of Pakfire.conf
|
||||
#
|
||||
sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf
|
||||
echo
|
||||
echo Update to IPfire $NEWVERSION finished. Please reboot...
|
||||
echo
|
||||
|
||||
@@ -80,10 +80,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
cd $(DIR_SRC)/ffmpeg && ./configure --prefix=/usr \
|
||||
--enable-shared \
|
||||
--enable-postproc \
|
||||
--enable-gpl \
|
||||
--enable-libmp3lame \
|
||||
--enable-libvorbis \
|
||||
--enable-libxvid
|
||||
--enable-gpl
|
||||
cd $(DIR_SRC)/ffmpeg && make
|
||||
cd $(DIR_SRC)/ffmpeg && make install
|
||||
cd $(DIR_SRC)/ffmpeg && make install-libs
|
||||
|
||||
Reference in New Issue
Block a user