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

[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  3cbadee8b8a7117024aa775891db821d2246fee5 (commit)
      from  8830b1b22454f908ca5c7c67f6c653cc4b66d067 (commit)

- Log -----------------------------------------------------------------
commit 3cbadee8b8a7117024aa775891db821d2246fee5
Author: Michael DeHaan <mdehaan at mdehaan.rdu.redhat.com>
Date:   Tue Jul 10 14:53:57 2007 -0400

    Further work on Live CD.
-----------------------------------------------------------------------

Diffstat:
 koan/app.py   |    1 +
 live/base.cfg |   28 ++++++++++++++++++----------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/koan/app.py b/koan/app.py
index c48960e..044e66a 100755
--- a/koan/app.py
+++ b/koan/app.py
@@ -365,6 +365,7 @@ class Koan:
             if self.live_cd:
                cmd.append("--bad-image-okay")
                cmd.append("--boot-filesystem=/dev/sda1")
+               cmd.append("--config-file=/tmp/boot/boot/grub/grub.conf")
             self.subprocess_call(cmd, fake_it=self.dryrun)
 
             if loader == "--lilo":
diff --git a/live/base.cfg b/live/base.cfg
index 44b002e..84a802b 100644
--- a/live/base.cfg
+++ b/live/base.cfg
@@ -30,6 +30,7 @@ part swap --size=1027 --ondisk=/dev/sda --asprimary
 @base
 #@core
 @hardware-support
+file
 syslinux
 kernel
 bash
@@ -116,30 +117,37 @@ mount /dev/sda /tmp/boot
 mkdir -p /tmp/boot/boot
 
 # install grub
+mknod /dev/mapper/livecd-rw b 8 0
 grub-install --root-directory=/tmp/boot/ --no-floppy /dev/sda
 
 # need a grub.conf file to run grubby from within koan
-cat > /boot/grub/grub.conf << EGRUB
+cat > /tmp/boot/boot/grub/grub.conf << EGRUB
 # grub.conf
 default=0
 timeout=5
-splashimage=(hd0,0)/boot/grub/splash.xpm.gz
+#splashimage=(hd0,0)/boot/grub/splash.xpm.gz
 hiddenmenu
 title spacer (2.6.21-1.3228.fc7)
 	root (hd0,0)
-	kernel /boot/vmlinuz-dummy blah
-	initrd /boot/initrd-dummy
+	kernel /boot/vmlinuz
+	initrd /boot/initrd.img
 EGRUB
 
-# now we're ready
-INSERT_KOAN_ARGS --livecd
+# however grub is a bit evil
+cp -a /tmp/boot/boot/grub /boot/grub
 
-# however the config file needs to be moved 
-cp /boot/grub/grub.conf /tmp/boot/boot/grub/grub.conf
+# 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
 
-# FIXME: fix file contents in /tmp/boot/boot/grub/grub.conf
-# so paths don't start with t/
+# now we're ready to do it for real
+INSERT_KOAN_ARGS --livecd
 
+# once through debugging
 # eject
 # reboot
 

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  8830b1b22454f908ca5c7c67f6c653cc4b66d067 \
  3cbadee8b8a7117024aa775891db821d2246fee5