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, master has been updated via 9306852543de7991f1cb0c1ce0a6022c477ba1d8 (commit) via 28998509ec1727dd5e981d0a1a6134b160e58f30 (commit) via 362acbabe51fe15147c58d78364a3fa22e7e1c55 (commit) via b8fab202926680747f87cad2cb0b4ec4126b1c59 (commit) via de78a2bfa8f8eb65256be01b5648a41a61acdaf1 (commit) from 8c85098a875f4b5554ed481cf9e6d6db3cbf3042 (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 9306852543de7991f1cb0c1ce0a6022c477ba1d8 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Feb 22 22:57:04 2015 +0100

core87: remove grub2 config/image on xen.

commit 28998509ec1727dd5e981d0a1a6134b160e58f30 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Feb 21 19:28:06 2015 +0100

core87: don't recreate S19checkfstab and S70console startlinks.

commit 362acbabe51fe15147c58d78364a3fa22e7e1c55 Merge: b8fab20 de78a2b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Feb 21 16:59:50 2015 +0100

Merge branch 'core87' of git.ipfire.org:/pub/git/ipfire-2.x into core87

commit b8fab202926680747f87cad2cb0b4ec4126b1c59 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Feb 21 16:54:15 2015 +0100

core87: add glibc to arm update.

commit de78a2bfa8f8eb65256be01b5648a41a61acdaf1 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Feb 21 11:45:30 2015 +0100

core87: add backupiso to update.

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

Summary of changes: config/rootfiles/core/87/exclude | 2 ++ config/rootfiles/{oldcore/77 => core/87}/filelists/armv5tel/glibc | 0 config/rootfiles/core/87/filelists/files | 1 + config/rootfiles/core/87/update.sh | 4 +++- 4 files changed, 6 insertions(+), 1 deletion(-) copy config/rootfiles/{oldcore/77 => core/87}/filelists/armv5tel/glibc (100%)

Difference in files: diff --git a/config/rootfiles/core/87/exclude b/config/rootfiles/core/87/exclude index cfb84a5..5be5371 100644 --- a/config/rootfiles/core/87/exclude +++ b/config/rootfiles/core/87/exclude @@ -5,6 +5,8 @@ etc/ipsec.secrets etc/ipsec.user.conf etc/ipsec.user.secrets etc/localtime +etc/rc.d/rcsysinit.d/S19checkfstab +etc/rc.d/rcsysinit.d/S70console etc/shadow etc/ssh/ssh_config etc/ssh/sshd_config diff --git a/config/rootfiles/core/87/filelists/armv5tel/glibc b/config/rootfiles/core/87/filelists/armv5tel/glibc new file mode 120000 index 0000000..4c70d72 --- /dev/null +++ b/config/rootfiles/core/87/filelists/armv5tel/glibc @@ -0,0 +1 @@ +../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/files b/config/rootfiles/core/87/filelists/files index 5bdca35..f0c3708 100644 --- a/config/rootfiles/core/87/filelists/files +++ b/config/rootfiles/core/87/filelists/files @@ -5,6 +5,7 @@ etc/rc.d/init.d/collectd etc/rc.d/init.d/leds opt/pakfire/etc/pakfire.conf usr/lib/firewall/rules.pl +usr/local/bin/backupiso usr/local/bin/update-bootloader usr/local/share/GeoIP/GeoIP.dat var/ipfire/header.pl diff --git a/config/rootfiles/core/87/update.sh b/config/rootfiles/core/87/update.sh index fea4488..172d854 100644 --- a/config/rootfiles/core/87/update.sh +++ b/config/rootfiles/core/87/update.sh @@ -198,7 +198,9 @@ case "$(uname -m)" in i?86) case "$(find_device "/")" in xvd* ) - echo Skip bootloader update on xen. + echo Skip remove grub2 files, because pygrub fail. + rm -f /boot/grub/* + echo config will recreated by linux-pae install. ;; * ) #

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