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 b93741f4ef58800e2e16e813bc39917d2595e191 (commit) via 9f969cc1a9a61d98910a1cbba1b7db4bf97d346e (commit) via 950fe4a5b598f45b7b92cd10ea55d715aa217330 (commit) via 94f6d10badacc7f9b019ae7ca687d78cd09b8b17 (commit) from 35f903358742a5c6ce299f995c5687df14f12f0d (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 b93741f4ef58800e2e16e813bc39917d2595e191 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Nov 23 21:54:42 2010 +0100

Remove unneeded mtd package.

commit 9f969cc1a9a61d98910a1cbba1b7db4bf97d346e Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Nov 23 21:54:15 2010 +0100

Updated kernel (2.6.32.26).

commit 950fe4a5b598f45b7b92cd10ea55d715aa217330 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Nov 23 21:52:49 2010 +0100

Add checkfs to test core updater.

commit 94f6d10badacc7f9b019ae7ca687d78cd09b8b17 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Nov 23 14:04:49 2010 +0100

Add emergency shell if filesystem check fail. Fix checkfstab for UUID entries.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/mtd | 1 - config/rootfiles/core/test/filelists/files | 1 + config/rootfiles/core/test/update.sh | 2 +- lfs/linux | 6 +- lfs/mtd | 87 ---------------------------- make.sh | 1 - src/initscripts/init.d/checkfs | 10 +-- src/initscripts/init.d/checkfstab | 11 +++- src/paks/linux-pae/install.sh | 2 +- src/paks/linux-xen/install.sh | 2 +- 10 files changed, 21 insertions(+), 102 deletions(-) delete mode 100644 config/rootfiles/common/mtd delete mode 100644 lfs/mtd

Difference in files: diff --git a/config/rootfiles/common/mtd b/config/rootfiles/common/mtd deleted file mode 100644 index 3940cd7..0000000 --- a/config/rootfiles/common/mtd +++ /dev/null @@ -1 +0,0 @@ -sbin/mkfs.jffs2 diff --git a/config/rootfiles/core/test/filelists/files b/config/rootfiles/core/test/filelists/files index 369dd01..eb3c951 100644 --- a/config/rootfiles/core/test/filelists/files +++ b/config/rootfiles/core/test/filelists/files @@ -1,4 +1,5 @@ etc/system-release +etc/rc.d/init.d/checkfs etc/rc.d/init.d/checkfstab etc/rc.d/init.d/squid srv/web/ipfire/cgi-bin/proxy.cgi diff --git a/config/rootfiles/core/test/update.sh b/config/rootfiles/core/test/update.sh index dd837ee..3c52e01 100644 --- a/config/rootfiles/core/test/update.sh +++ b/config/rootfiles/core/test/update.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 # -KVER="2.6.32.25" +KVER="2.6.32.26" MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` # Nur den letzten Parameter verwenden echo $MOUNT > /dev/null diff --git a/lfs/linux b/lfs/linux index 0a4d3e6..add0b9e 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@

include Config

-PATCHLEVEL = .25 -VER = 2.6.32.25 +PATCHLEVEL = .26 +VER = 2.6.32.26

THISAPP = linux-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -68,7 +68,7 @@ patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2 xen-patches-2.6.32-2d.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2d.tar.bz2

-$(DL_FILE)_MD5 = 0d6ad4e7e387f56c5b5831beb97c0c1f +$(DL_FILE)_MD5 = bdb37b8e48aaf33d9bd6e2af3ae2f1ea netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91 diff --git a/lfs/mtd b/lfs/mtd deleted file mode 100644 index 6e1a70c..0000000 --- a/lfs/mtd +++ /dev/null @@ -1,87 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program 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. # -# # -# This program 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 this program. If not, see http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = CVS-20070507 - -THISAPP = mtd-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/mtd -ifeq "$(LFS_PASS)" "install" - TARGET = $(DIR_INFO)/$(THISAPP)-install -else - TARGET = $(DIR_INFO)/$(THISAPP) -endif - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 788e4255023e325172ad42a26f4685bb - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - -ifeq "$(LFS_PASS)" "install" - cd $(DIR_APP)/util && make mkfs.jffs2 CFLAGS="$(CFLAGS) -I ../include -I/opt/$(MACHINE)-uClibc/include" \ - LDFLAGS=-static - cd $(DIR_APP)/util && install -m 755 mkfs.jffs2 /install/initrd/sbin/mkfs.jffs2 -else - cd $(DIR_APP)/util && make mkfs.jffs2 CFLAGS="$(CFLAGS) -I ../include" - cd $(DIR_APP)/util && install -m 755 mkfs.jffs2 /sbin/mkfs.jffs2 -endif - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 2222e77..24753ce 100755 --- a/make.sh +++ b/make.sh @@ -327,7 +327,6 @@ buildbase() { lfsmake2 man lfsmake2 mktemp lfsmake2 module-init-tools - lfsmake2 mtd lfsmake2 net-tools lfsmake2 patch lfsmake2 psmisc diff --git a/src/initscripts/init.d/checkfs b/src/initscripts/init.d/checkfs index f31390d..1127099 100644 --- a/src/initscripts/init.d/checkfs +++ b/src/initscripts/init.d/checkfs @@ -98,19 +98,17 @@ case "${1}" in

if [ "${error_value}" -gt 3 -a "${error_value}" -lt 16 ]; then echo_failure + sleep 2 boot_mesg -n "FAILURE:\n\nFile system errors" ${FAILURE} boot_mesg -n " were encountered that could not be" boot_mesg -n " fixed automatically. This system" boot_mesg -n " cannot continue to boot and will" boot_mesg -n " therefore be halted until those" boot_mesg -n " errors are fixed manually by a" - boot_mesg -n " System Administrator.\n\nAfter you" - boot_mesg -n " press Enter, this system will be" - boot_mesg -n " halted and powered off." - boot_mesg -n "\n\nPress Enter to continue or wait a minute..." ${INFO} + boot_mesg -n " System Administrator.\n\n" boot_mesg "" ${NORMAL} - read -t 60 ENTER - ${rc_base}/init.d/halt stop + sulogin + reboot -f fi

if [ "${error_value}" -ge 16 ]; then diff --git a/src/initscripts/init.d/checkfstab b/src/initscripts/init.d/checkfstab index 2fe80bf..691050e 100644 --- a/src/initscripts/init.d/checkfstab +++ b/src/initscripts/init.d/checkfstab @@ -25,7 +25,7 @@ case "${1}" in read CMDLINE < /proc/cmdline ROOTPOS=`expr index "$CMDLINE" root=` NEWROOT=`echo ${CMDLINE:$ROOTPOS} | cut -d"=" -f2 | cut -d" " -f1`; - OLDBOOT=`cat /etc/fstab | grep -m1 "/boot" | cut -d" " -f1 | cut -f1`; + OLDBOOT=`cat /etc/fstab | grep -m1 " / " | cut -d" " -f1 | cut -f1`; OLDDRV=${OLDBOOT::`expr length $OLDBOOT`-1} NEWDRV=${NEWROOT::`expr length $NEWROOT`-1} if [ "$OLDDRV" == "$NEWDRV" ]; then @@ -38,6 +38,15 @@ case "${1}" in boot_mesg "Bootdrive: $NEWDRV" boot_mesg "fstab-entry: $OLDDRV" boot_mesg + if [ "${OLDDRV:0:4}" == "UUID" ]; then + #Short sleep because the kernel has not finished hardware detections + #and made many messages here and the password question is not readable + sleep 3 + boot_mesg "${FAILURE}Error OLD Bootdrive is already a UUID. Can't fix." + boot_mesg "${NORMAL}" + sulogin + reboot -f + fi boot_mesg "Attempt to repair it ..." mount -o remount,rw / sed -i -e "s|$OLDDRV|$NEWDRV|g" /etc/fstab diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh index 384a31d..e323ee8 100644 --- a/src/paks/linux-pae/install.sh +++ b/src/paks/linux-pae/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.25 +KVER=2.6.32.26 ROOT=`mount | grep " / " | cut -d" " -f1` ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` if [ ! -z $ROOTUUID ]; then diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh index c80c0fd..d566405 100644 --- a/src/paks/linux-xen/install.sh +++ b/src/paks/linux-xen/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.25 +KVER=2.6.32.26 ROOT=`mount | grep " / " | cut -d" " -f1` ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` if [ ! -z $ROOTUUID ]; then

hooks/post-receive -- IPFire 2.x development tree