[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. 908719c955c7af7752e
From: git () ipfire ! org (Arne Fitzenreiter)
Date: 2010-08-18 19:50:35
Message-ID: 20100818195035.AD9A3166441D () 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 908719c955c7af7752ee09bcb6a79d2a3919a22e (commit)
via 3cbeb8c7a14843ea43695efa6bf02cceb2579ba5 (commit)
via 3b50eb81be2d25f254d24c0795fd2ce3f97c481a (commit)
via 8190e95105d0398862f0be73b6b4e4fbd8b27214 (commit)
via ee788c9e4607e6dca23baee4292d1be0dff27dfb (commit)
via ec3573fc83603317b0e9dd195426d8947a1c25f2 (commit)
from 063191c490226cbb673a3549b9dc329360aeec5c (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 908719c955c7af7752ee09bcb6a79d2a3919a22e
Merge: 3cbeb8c 8190e95
Author: Arne Fitzenreiter <arne_f at ipfire.org>
Date: Wed Aug 18 21:54:42 2010 +0200
Merge branch 'master' into next
Conflicts:
config/rootfiles/core/40/filelists/files
config/rootfiles/core/40/update.sh
commit 3cbeb8c7a14843ea43695efa6bf02cceb2579ba5
Author: Arne Fitzenreiter <arne_f at ipfire.org>
Date: Wed Aug 18 21:52:57 2010 +0200
Flashimage use UUID for fstab.
commit 3b50eb81be2d25f254d24c0795fd2ce3f97c481a
Author: Arne Fitzenreiter <arne_f at ipfire.org>
Date: Wed Aug 18 21:52:29 2010 +0200
Skip checkfstab if root is set by UUID.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/packages/clamav | 6 +++---
doc/packages-list.txt | 2 +-
html/cgi-bin/qos.cgi | 4 ++--
lfs/clamav | 6 +++---
lfs/flash-images | 6 ++++--
src/initscripts/init.d/checkfstab | 4 ++++
6 files changed, 17 insertions(+), 11 deletions(-)
Difference in files:
diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index 4e05795..10d15ac 100644
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -10,15 +10,15 @@ usr/bin/sigtool
#usr/lib/libclamav.la
usr/lib/libclamav.so
usr/lib/libclamav.so.6
-usr/lib/libclamav.so.6.1.3
+usr/lib/libclamav.so.6.1.4
#usr/lib/libclamunrar.la
usr/lib/libclamunrar.so
usr/lib/libclamunrar.so.6
-usr/lib/libclamunrar.so.6.1.3
+usr/lib/libclamunrar.so.6.1.4
#usr/lib/libclamunrar_iface.la
usr/lib/libclamunrar_iface.so
usr/lib/libclamunrar_iface.so.6
-usr/lib/libclamunrar_iface.so.6.1.3
+usr/lib/libclamunrar_iface.so.6.1.4
#usr/lib/pkgconfig/libclamav.pc
usr/sbin/clamd
usr/share/clamav
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index e281e50..e1ed310 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -64,7 +64,7 @@
* ccache-3.0pre0
* cdrtools-2.01.01
* centerim-4.22.1
-* clamav-0.96.1
+* clamav-0.96.2
* cmake-2.4.8
* collectd-4.9.1
* compat-wireless-2.6.35-1-kmod-2.6.32.19-ipfire
diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 1beb9e3..26e0eef 100644
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -1117,10 +1117,10 @@ END
print <<END
</select><td width='33%' align='center'>
<tr><td width='33%' align='right'>$Lang::tr{'source port'}:
- <td width='33%' align='left'><input type='text' name='QPORT' maxlength='5' \
value='$qossettings{'QPORT'}' /> + <td width='33%' align='left'><input \
type='text' name='QPORT' maxlength='11' value='$qossettings{'QPORT'}' /> <td \
width='33%' align='center'> <tr><td width='33%' \
align='right'>$Lang::tr{'destination port'}:
- <td width='33%' align='left'><input type='text' name='DPORT' maxlength='5' \
value='$qossettings{'DPORT'}' /> + <td width='33%' align='left'><input \
type='text' name='DPORT' maxlength='11' value='$qossettings{'DPORT'}' /> <td \
width='33%' align='center'> <tr><td width='33%' \
align='right'>$Lang::tr{'source ip'}:
<td width='33%' align='left'><input type='text' name='QIP' maxlength='15' \
value='$qossettings{'QIP'}' />
diff --git a/lfs/clamav b/lfs/clamav
index fdc44ad..c680f96 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -24,7 +24,7 @@
include Config
-VER = 0.96.1
+VER = 0.96.2
THISAPP = clamav-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = clamav
-PAK_VER = 12
+PAK_VER = 13
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 38e7870db6e9ad0e569518499a6f3651
+$(DL_FILE)_MD5 = a2c2555d86868f91a01d0e2c2403bbec
install : $(TARGET)
diff --git a/lfs/flash-images b/lfs/flash-images
index 52fde64..99ed45f 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -94,10 +94,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
chroot $(MNThdd) /usr/bin/perl -e "require '/var/ipfire/lang.pl'; \
&Lang::BuildCacheLang" sed -i -e "s|MOUNT|ro|g" $(MNThdd)/boot/grub/grub.conf
sed -i -e "s|KVER|$(KVER)|g" $(MNThdd)/boot/grub/grub.conf
- sed -i -e "s|ROOT|/dev/sda3|g" $(MNThdd)/boot/grub/grub.conf
+ sed -i -e "s|ROOT|UUID=$$(blkid -sUUID $(IMGroot) | cut -d'"' -f2)|g" \
$(MNThdd)/boot/grub/grub.conf ln -s grub.conf $(MNThdd)/boot/grub/menu.lst
+ sed -i -e "s|DEVICE1|UUID=$$(blkid -sUUID $(IMGboot) | cut -d'"' -f2)|g" \
$(MNThdd)/etc/fstab sed -i -e "s|DEVICE2|#DEVICE2|g" $(MNThdd)/etc/fstab
- sed -i -e "s|DEVICE|/dev/sda|g" $(MNThdd)/etc/fstab
+ sed -i -e "s|DEVICE3|UUID=$$(blkid -sUUID $(IMGroot) | cut -d'"' -f2)|g" \
$(MNThdd)/etc/fstab + sed -i -e "s|DEVICE4|UUID=$$(blkid -sUUID $(IMGvar) | cut -d'"' \
-f2)|g" $(MNThdd)/etc/fstab sed -i -e "s|FSTYPE|ext2|g" $(MNThdd)/etc/fstab
# Copy grub files manually
diff --git a/src/initscripts/init.d/checkfstab b/src/initscripts/init.d/checkfstab
index c9fa2bc..2fe80bf 100644
--- a/src/initscripts/init.d/checkfstab
+++ b/src/initscripts/init.d/checkfstab
@@ -17,6 +17,10 @@
case "${1}" in
start)
+ #Skip if root is set by UUID
+ if (grep "root=UUID=" /proc/cmdline); then
+ exit 0;
+ fi
boot_mesg "Checking fstab bootdevice ..."
read CMDLINE < /proc/cmdline
ROOTPOS=`expr index "$CMDLINE" root=`
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