[Et-mgmt-commits-list] [SCM] koan branch, master now at v0.2.9-25-g7100ad8

[Michael DeHaan]

Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  7100ad81276f9ce63cc2ba2a9db4d38cdbbef494 (commit)
      from  3cbadee8b8a7117024aa775891db821d2246fee5 (commit)

- Log -----------------------------------------------------------------
commit 7100ad81276f9ce63cc2ba2a9db4d38cdbbef494
Author: Michael DeHaan <mdehaan at mdehaan.rdu.redhat.com>
Date:   Tue Jul 10 15:08:38 2007 -0400

    Grub can be made to work if fstab and mtab are hacked around a bit
-----------------------------------------------------------------------

Diffstat:
 live/base.cfg |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/live/base.cfg b/live/base.cfg
index 84a802b..52e002b 100644
--- a/live/base.cfg
+++ b/live/base.cfg
@@ -105,15 +105,25 @@ chkconfig --level 345 readahead_later off
 touch /media/.hal-mtab
 
 # take over a drive to use as temporary space
-sfdisk /dev/hda -uM << ESFDISK
+sfdisk /dev/sda -uM << ESFDISK
 	,1000
 	;
 ESFDISK
 mkfs -t ext3 /dev/sda1
 
+# fix fstab/mtab
+
+cat >> /etc/fstab << EFSTAB
+/dev/sda1	/tmp/boot	ext3	defaults,noatime 0 0
+EFSTAB
+
+cat >> /etc/mtab << EMTAB
+/dev/sda1 /tmp/boot ext3 rw,noatime 0 0
+EMTAB
+
 # make a boot directory on the filesystem so grub can be happy
 mkdir /tmp/boot
-mount /dev/sda /tmp/boot
+mount /dev/sda1 /tmp/boot
 mkdir -p /tmp/boot/boot
 
 # install grub
@@ -133,17 +143,6 @@ title spacer (2.6.21-1.3228.fc7)
 	initrd /boot/initrd.img
 EGRUB
 
-# however grub is a bit evil
-cp -a /tmp/boot/boot/grub /boot/grub
-
-# so now we install it enough to fake
-# out the installer -- though this doesn't work either :)
-grub << FIXGRUB
-root (hd0,0)
-setup (hd0)
-quit
-FIXGRUB
-
 # now we're ready to do it for real
 INSERT_KOAN_ARGS --livecd
 

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  3cbadee8b8a7117024aa775891db821d2246fee5 \
  7100ad81276f9ce63cc2ba2a9db4d38cdbbef494