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

Work on update.sh, move core15 to updater

Browse Source 
fix collectd rootfiles
removed collectd files from oldcore lists
This commit is contained in:
Arne Fitzenreiter
2008-06-11 18:30:26 +02:00
parent 2d9ee0500e
commit 609d4fa513
11 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/cdrom_corever
View File

@@ -1 +1 @@
14
15

4
config/rootfiles/common/collectd
View File

@@ -86,8 +86,8 @@ usr/lib/collectd/vmem.so
#usr/lib/perl5/site_perl/5.8.8/Collectd/Unixsock.pm
#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Collectd
#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Collectd/.packlist
#usr/sbin/collectd
#usr/sbin/collectdmon
usr/sbin/collectd
usr/sbin/collectdmon
#usr/share/man/man1/collectd-nagios.1
#usr/share/man/man1/collectd.1
#usr/share/man/man1/collectdmon.1

2
config/rootfiles/common/oldcore10
View File

@@ -1,5 +1,3 @@
etc/collectd.conf
etc/rc.d/init.d/collectd
usr/local/bin/wirelessctrl
srv/web/ipfire/cgi-bin/optionsfw.cgi
srv/web/ipfire/cgi-bin/gui.cgi

7
config/rootfiles/common/oldcore7
View File

@@ -1,8 +1,3 @@
etc/collectd.conf
etc/rc.d/init.d/collectd
etc/rc.d/rc0.d/K50collectd
etc/rc.d/rc3.d/S20collectd
etc/rc.d/rc6.d/K50collectd
etc/rc.d/rc3.d/S19smartenabler
etc/rc.d/init.d/smartenabler
etc/rc.d/init.d/networking/red
@@ -11,10 +6,8 @@ srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
srv/web/ipfire/cgi-bin/network.cgi
srv/web/ipfire/cgi-bin/optionsfw.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
usr/lib/collectd
usr/local/bin/makegraphs
usr/local/bin/wirelessctrl
usr/sbin/collectd
var/ipfire/graphs.pl
var/ipfire/menu.d/20-status.menu
var/ipfire/langs

3
config/rootfiles/common/oldcore9
View File

@@ -1,7 +1,4 @@
sbin/hdparm
usr/lib/collectd
usr/sbin/collectd
usr/sbin/collectdmon
etc/rc.d/init.d/networking/red
etc/squid
sbin/capiinit

0
config/rootfiles/core/16/files Normal file
View File

0
config/rootfiles/core/15/meta → config/rootfiles/core/16/meta
View File

0
config/rootfiles/core/15/update.sh → config/rootfiles/core/16/update.sh
View File

4
config/rootfiles/updater/filelists/collectd
View File

@@ -86,8 +86,8 @@ usr/lib/collectd/vmem.so
#usr/lib/perl5/site_perl/5.8.8/Collectd/Unixsock.pm
#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Collectd
#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Collectd/.packlist
#usr/sbin/collectd
#usr/sbin/collectdmon
usr/sbin/collectd
usr/sbin/collectdmon
#usr/share/man/man1/collectd-nagios.1
#usr/share/man/man1/collectd.1
#usr/share/man/man1/collectdmon.1

1
config/rootfiles/core/15/files → config/rootfiles/updater/filelists/core15
View File

@@ -1,3 +1,4 @@
opt/pakfire/db/core/mine
etc/init.d/mISDN
etc/modprobe.d/blacklist
usr/bin/bc

33
config/rootfiles/updater/update.sh
View File

@@ -33,24 +33,25 @@ echo $MOUNT > /dev/null
MOUNT=$_
INSTALLEDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2`
INSTALLEDCORE=`cat /opt/pakfire/db/core/mine`
OLDKERNEL=`ls /boot/vmlinuz-*-ipfire | cut -d"-" -f2 | tail -n 1`
#
# 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
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
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 Update IPFire $OLDVERSION to $NEWVERSION
echo
echo Press Enter to begin.
read
@@ -80,16 +81,19 @@ echo Unpack the updated files ...
tar xjvf files.ipfire -C /
#
# Modify grub.conf
#
#
echo
echo Update grub configuration ...
sed -i "s|MOUNT|$ROOT|g" /boot/grub/grub.conf
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
echo "title Old Kernel" >> /boot/grub/grub.conf
echo " configfile /grub/grub-old.conf" >> /boot/grub/grub.conf
echo " configfile /grub/grub-old.conf" >> /boot/grub/grub.conf
sed -i "s|/vmlinuz-ipfire|/vmlinuz-$OLDKERNEL-ipfire|g" /boot/grub/grub-old.conf
#
# Made initramdisk
#
echo
echo Create new Initramdisks ...
if [ "${ROOT:0:7}" == "/dev/sd" ]; then
# Remove ide hook if root is on sda
@@ -106,6 +110,17 @@ 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
#
# Create new issue
#
echo IPFire v$NEWVERSION - www.ipfire.org > /etc/issue
echo =================================== >> /etc/issue
echo \\n running on \\s \\r \\m >> /etc/issue
# Core 15 begin
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
/etc/init.d/mISDN config
# Core 15 end
echo
echo Update to IPfire $NEWVERSION finished. Please reboot...
echo
echo Update to IPFire $NEWVERSION finished. Please reboot...
echo