[prev in list] [next in list] [prev in thread] [next in thread]
List: ipfire-scm
Subject: [IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 063191c490226cbb673
From: git () ipfire ! org (Arne Fitzenreiter)
Date: 2010-08-17 21:59:10
Message-ID: 20100817215910.E74EA166449A () mail01 ! tremer ! info
[Download RAW message or body]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 063191c490226cbb673a3549b9dc329360aeec5c (commit)
via b0ab1b098ed35da40aebc5bb3ab77839d9f17a53 (commit)
from c32eea083ba011e46abca44fa26cda8875769768 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 063191c490226cbb673a3549b9dc329360aeec5c
Author: Arne Fitzenreiter <arne_f at ipfire.org>
Date: Wed Aug 18 00:03:00 2010 +0200
Remove emergency grub entry.
commit b0ab1b098ed35da40aebc5bb3ab77839d9f17a53
Author: Arne Fitzenreiter <arne_f at ipfire.org>
Date: Wed Aug 18 00:01:50 2010 +0200
Start updater (test).
-----------------------------------------------------------------------
Summary of changes:
config/grub/grub.conf | 5 --
config/rootfiles/core/test/exclude | 1 +
config/rootfiles/core/test/filelists/dracut | 1 +
config/rootfiles/core/test/filelists/files | 3 +
.../{oldcore/38 => core/test}/filelists/grub | 0
.../{oldcore/28 => core/test}/filelists/linux | 0
.../28 => core/test}/filelists/linux-firmware | 0
config/rootfiles/core/test/filelists/tcl | 1 +
.../{oldcore/28 => core/test}/filelists/udev | 0
.../34 => core/test}/filelists/usb_modeswitch | 0
.../core/test/filelists/usb_modeswitch_data | 1 +
config/rootfiles/{oldcore/24 => core/test}/meta | 0
.../rootfiles/{oldcore/34 => core/test}/update.sh | 56 ++++++-------------
13 files changed, 25 insertions(+), 43 deletions(-)
create mode 100644 config/rootfiles/core/test/exclude
create mode 120000 config/rootfiles/core/test/filelists/dracut
create mode 100644 config/rootfiles/core/test/filelists/files
copy config/rootfiles/{oldcore/38 => core/test}/filelists/grub (100%)
copy config/rootfiles/{oldcore/28 => core/test}/filelists/linux (100%)
copy config/rootfiles/{oldcore/28 => core/test}/filelists/linux-firmware (100%)
create mode 120000 config/rootfiles/core/test/filelists/tcl
copy config/rootfiles/{oldcore/28 => core/test}/filelists/udev (100%)
copy config/rootfiles/{oldcore/34 => core/test}/filelists/usb_modeswitch (100%)
create mode 120000 config/rootfiles/core/test/filelists/usb_modeswitch_data
copy config/rootfiles/{oldcore/24 => core/test}/meta (100%)
copy config/rootfiles/{oldcore/34 => core/test}/update.sh (74%)
Difference in files:
diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index b4e2796..c3f2ebd 100644
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -39,8 +39,3 @@ title IPFire (single Processor)
kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 nosmp MOUNT
initrd /ipfirerd-KVER.img
savedefault 5
-title IPFire (all storage drivers)
- root (hd0,0)
- kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT
- initrd /ipfirerd-KVER-emergency.img
- savedefault 6
diff --git a/config/rootfiles/core/test/exclude b/config/rootfiles/core/test/exclude
new file mode 100644
index 0000000..759e081
--- /dev/null
+++ b/config/rootfiles/core/test/exclude
@@ -0,0 +1 @@
+etc/udev/rules.d/30-persistent-network.rules
diff --git a/config/rootfiles/core/test/filelists/dracut \
b/config/rootfiles/core/test/filelists/dracut new file mode 120000
index 0000000..1608699
--- /dev/null
+++ b/config/rootfiles/core/test/filelists/dracut
@@ -0,0 +1 @@
+../../../common/dracut
\ No newline at end of file
diff --git a/config/rootfiles/core/test/filelists/files \
b/config/rootfiles/core/test/filelists/files new file mode 100644
index 0000000..509483d
--- /dev/null
+++ b/config/rootfiles/core/test/filelists/files
@@ -0,0 +1,3 @@
+etc/system-release
+etc/rc.d/init.d/checkfstab
+usr/local/bin/rebuild-initrd
diff --git a/config/rootfiles/core/test/filelists/grub \
b/config/rootfiles/core/test/filelists/grub new file mode 120000
index 0000000..050745c
--- /dev/null
+++ b/config/rootfiles/core/test/filelists/grub
@@ -0,0 +1 @@
+../../../common/grub
\ No newline at end of file
diff --git a/config/rootfiles/core/test/filelists/linux \
b/config/rootfiles/core/test/filelists/linux new file mode 120000
index 0000000..c469fe1
--- /dev/null
+++ b/config/rootfiles/core/test/filelists/linux
@@ -0,0 +1 @@
+../../../common/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/test/filelists/linux-firmware \
b/config/rootfiles/core/test/filelists/linux-firmware new file mode 120000
index 0000000..4bf91bc
--- /dev/null
+++ b/config/rootfiles/core/test/filelists/linux-firmware
@@ -0,0 +1 @@
+../../../common/linux-firmware
\ No newline at end of file
diff --git a/config/rootfiles/core/test/filelists/tcl \
b/config/rootfiles/core/test/filelists/tcl new file mode 120000
index 0000000..7f620c6
--- /dev/null
+++ b/config/rootfiles/core/test/filelists/tcl
@@ -0,0 +1 @@
+../../../common/tcl
\ No newline at end of file
diff --git a/config/rootfiles/core/test/filelists/udev \
b/config/rootfiles/core/test/filelists/udev new file mode 120000
index 0000000..e967a1c
--- /dev/null
+++ b/config/rootfiles/core/test/filelists/udev
@@ -0,0 +1 @@
+../../../common/udev
\ No newline at end of file
diff --git a/config/rootfiles/core/test/filelists/usb_modeswitch \
b/config/rootfiles/core/test/filelists/usb_modeswitch new file mode 120000
index 0000000..acbab6f
--- /dev/null
+++ b/config/rootfiles/core/test/filelists/usb_modeswitch
@@ -0,0 +1 @@
+../../../common/usb_modeswitch
\ No newline at end of file
diff --git a/config/rootfiles/core/test/filelists/usb_modeswitch_data \
b/config/rootfiles/core/test/filelists/usb_modeswitch_data new file mode 120000
index 0000000..4cbce46
--- /dev/null
+++ b/config/rootfiles/core/test/filelists/usb_modeswitch_data
@@ -0,0 +1 @@
+../../../common/usb_modeswitch_data
\ No newline at end of file
diff --git a/config/rootfiles/core/test/meta b/config/rootfiles/core/test/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/test/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/test/update.sh \
b/config/rootfiles/core/test/update.sh new file mode 100644
index 0000000..1a18fce
--- /dev/null
+++ b/config/rootfiles/core/test/update.sh
@@ -0,0 +1,115 @@
+#!/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) 2010 IPFire-Team <info at ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+#
+KVER="2.6.32.19"
+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=$_
+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
+echo etc/mkinitcpio.conf >> /opt/pakfire/tmp/ROOTFILES
+echo etc/mkinitcpio.conf.org >> /opt/pakfire/tmp/ROOTFILES
+echo etc/mkinitcpio.d >> /opt/pakfire/tmp/ROOTFILES
+echo lib/initcpio >> /opt/pakfire/tmp/ROOTFILES
+echo sbin/mkinitcpio >> /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/*-ipfire
+# Remove mkinitcpio
+rm -rf /etc/mkinitcpio.*
+rm -rf /lib/initcpio
+rm -rf /sbin/mkinitcpio
+#
+# Backup grub.conf
+#
+cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org
+#
+# Unpack the updated files
+#
+echo
+echo Unpack the updated files ...
+#
+tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
+ --no-overwrite-dir
+#
+# Modify grub.conf
+#
+echo
+echo Update grub configuration ...
+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
+
+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
+/usr/bin/logger -p syslog.emerg -t kernel "Upgrade finished. If you use a customized \
grub.cfg" +/usr/bin/logger -p syslog.emerg -t kernel "Check it before reboot !!!"
+/usr/bin/logger -p syslog.emerg -t kernel " *** Please reboot... *** "
hooks/post-receive
--
IPFire 2.x development tree
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic