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 05ffd50f499d7090c4224f604dccaf1ce53a2452 (commit) via e644e0ce0f462bcde27c22526184453a23a1625b (commit) from ba48a4a5d521e5d68ae52cbaf579e54cc9d31a61 (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 05ffd50f499d7090c4224f604dccaf1ce53a2452 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Mar 8 19:18:49 2010 +0100
Fix grub at flashimage.
commit e644e0ce0f462bcde27c22526184453a23a1625b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Mar 8 19:18:26 2010 +0100
Grub rootfile update.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/grub | 33 +++++++++++++++------------------ lfs/flash-images | 4 ++-- 2 files changed, 17 insertions(+), 20 deletions(-)
Difference in files: diff --git a/config/rootfiles/common/grub b/config/rootfiles/common/grub index 2324e1c..e466ff0 100644 --- a/config/rootfiles/common/grub +++ b/config/rootfiles/common/grub @@ -1,5 +1,4 @@ #boot/grub -#boot/grub/default boot/grub/grub.conf boot/grub/ipfire.xpm.gz boot/grub/stage1 @@ -7,22 +6,6 @@ boot/grub/stage2 #usr/bin/mbchk #usr/info/grub.info #usr/info/multiboot.info -usr/lib/grub -#usr/lib/grub/i386-pc -#usr/lib/grub/i386-pc/e2fs_stage1_5 -#usr/lib/grub/i386-pc/fat_stage1_5 -#usr/lib/grub/i386-pc/ffs_stage1_5 -#usr/lib/grub/i386-pc/iso9660_stage1_5 -#usr/lib/grub/i386-pc/jfs_stage1_5 -#usr/lib/grub/i386-pc/minix_stage1_5 -#usr/lib/grub/i386-pc/reiserfs_stage1_5 -#usr/lib/grub/i386-pc/reiser4_stage1_5 -#usr/lib/grub/i386-pc/stage1 -#usr/lib/grub/i386-pc/stage2 -#usr/lib/grub/i386-pc/stage2_eltorito -#usr/lib/grub/i386-pc/ufs2_stage1_5 -#usr/lib/grub/i386-pc/vstafs_stage1_5 -#usr/lib/grub/i386-pc/xfs_stage1_5 #usr/man/man1/mbchk.1 #usr/man/man8/grub-install.8 #usr/man/man8/grub-md5-crypt.8 @@ -31,5 +14,19 @@ usr/lib/grub usr/sbin/grub usr/sbin/grub-install usr/sbin/grub-md5-crypt -usr/sbin/grub-set-default usr/sbin/grub-terminfo +usr/share/grub +#usr/share/grub/i386-pc +#usr/share/grub/i386-pc/e2fs_stage1_5 +#usr/share/grub/i386-pc/fat_stage1_5 +#usr/share/grub/i386-pc/ffs_stage1_5 +#usr/share/grub/i386-pc/iso9660_stage1_5 +#usr/share/grub/i386-pc/jfs_stage1_5 +#usr/share/grub/i386-pc/minix_stage1_5 +#usr/share/grub/i386-pc/reiserfs_stage1_5 +#usr/share/grub/i386-pc/stage1 +#usr/share/grub/i386-pc/stage2 +#usr/share/grub/i386-pc/stage2_eltorito +#usr/share/grub/i386-pc/ufs2_stage1_5 +#usr/share/grub/i386-pc/vstafs_stage1_5 +#usr/share/grub/i386-pc/xfs_stage1_5 diff --git a/lfs/flash-images b/lfs/flash-images index f3353ff..5eff02a 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -106,8 +106,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ln -s ipfirerd-$(KVER)-emergency.img $(MNThdd)/boot/ipfirerd-$(KVER).img
# Copy grub files manually - cp -f $(MNThdd)/usr/lib/grub/i386-pc/* $(MNThdd)/boot/grub/ - chroot $(MNThdd) /usr/sbin/grub-set-default 0 + cp -f $(MNThdd)/usr/share/grub/i386-pc/* $(MNThdd)/boot/grub/ + #chroot $(MNThdd) /usr/sbin/grub-set-default 0
# Create a script for rebuild-initrd and setup echo "#!/bin/bash" > $(MNThdd)/etc/rc.d/rcsysinit.d/S75firstsetup
hooks/post-receive -- IPFire 2.x development tree