Work on update.sh, move core15 to updater

fix collectd rootfiles
removed collectd files from oldcore lists

diff --git a/config/rootfiles/cdrom_corever b/config/rootfiles/cdrom_corever
index 8351c19397f4fcd5238d10034fa7fa384f14d580..60d3b2f4a4cd5f1637eba020358bfe5ecb5edcf2 100644 (file)
--- a/config/rootfiles/cdrom_corever
+++ b/config/rootfiles/cdrom_corever
@@ -1 +1 @@
-14
+15

diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd
index db4090a431a42d3fe1f0258bddf32c218a1bbb28..7cbd345e96d83c00a360c881eb4a11d7f85c3971 100644 (file)
--- a/config/rootfiles/common/collectd
+++ b/config/rootfiles/common/collectd
@@ -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

diff --git a/config/rootfiles/common/oldcore10 b/config/rootfiles/common/oldcore10
index 771d2c97237ca2ccc4a028c64ca601b7f2d2e727..0920338537160c11ffb0e7f07bf14d52c5ef3f91 100644 (file)
--- a/config/rootfiles/common/oldcore10
+++ b/config/rootfiles/common/oldcore10
@@ -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

diff --git a/config/rootfiles/common/oldcore7 b/config/rootfiles/common/oldcore7
index 3c4d08a6a29700d43625e39bebf1842135e37380..f6ec3fc5f6064f748dc570f42164b5f4f2ae4628 100644 (file)
--- a/config/rootfiles/common/oldcore7
+++ b/config/rootfiles/common/oldcore7
@@ -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

diff --git a/config/rootfiles/common/oldcore9 b/config/rootfiles/common/oldcore9
index 808cd38b53291beeed396d20587a8f6019274fce..aca00455cb1fa9afcbf51e649e19ec25d4b25e17 100644 (file)
--- a/config/rootfiles/common/oldcore9
+++ b/config/rootfiles/common/oldcore9
@@ -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

diff --git a/config/rootfiles/core/16/files b/config/rootfiles/core/16/files
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/config/rootfiles/core/15/meta b/config/rootfiles/core/16/meta
similarity index 100%
rename from config/rootfiles/core/15/meta
rename to config/rootfiles/core/16/meta

diff --git a/config/rootfiles/core/15/update.sh b/config/rootfiles/core/16/update.sh
similarity index 100%
rename from config/rootfiles/core/15/update.sh
rename to config/rootfiles/core/16/update.sh

diff --git a/config/rootfiles/updater/filelists/collectd b/config/rootfiles/updater/filelists/collectd
index db4090a431a42d3fe1f0258bddf32c218a1bbb28..7cbd345e96d83c00a360c881eb4a11d7f85c3971 100644 (file)
--- a/config/rootfiles/updater/filelists/collectd
+++ b/config/rootfiles/updater/filelists/collectd
@@ -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

diff --git a/config/rootfiles/core/15/files b/config/rootfiles/updater/filelists/core15
similarity index 93%
rename from config/rootfiles/core/15/files
rename to config/rootfiles/updater/filelists/core15
index a887593baa970d1476ffbfedc797f2d6749015b9..d170a993478d75f069c66610df8f416734be623d 100644 (file)
--- a/config/rootfiles/core/15/files
+++ b/config/rootfiles/updater/filelists/core15
@@ -1,3 +1,4 @@
+opt/pakfire/db/core/mine
 etc/init.d/mISDN
 etc/modprobe.d/blacklist
 usr/bin/bc

diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
index 3cef7582c6ce7dfda0092e0b7ff6bcf6b22d70de..3ea3835baa8451941c184f8fd735563782455f89 100755 (executable)
--- a/config/rootfiles/updater/update.sh
+++ b/config/rootfiles/updater/update.sh
@@ -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
-echo Update to IPfire $NEWVERSION finished. Please reboot...
+echo Update to IPFire $NEWVERSION finished. Please reboot...
 echo