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

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

- Log -----------------------------------------------------------------
commit 8830b1b22454f908ca5c7c67f6c653cc4b66d067
Author: Michael DeHaan <mdehaan at mdehaan.rdu.redhat.com>
Date:   Mon Jul 9 18:42:18 2007 -0400

    More LiveCD hacking and fun with grub/grubby.
-----------------------------------------------------------------------

Diffstat:
 koan/app.py   |    3 +--
 live/base.cfg |   27 ++++++++++++++++++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/koan/app.py b/koan/app.py
index e479473..c48960e 100755
--- a/koan/app.py
+++ b/koan/app.py
@@ -364,8 +364,7 @@ class Koan:
             ]
             if self.live_cd:
                cmd.append("--bad-image-okay")
-               cmd.append("--boot-filesystem=/dev/sda")
-               cmd.append("--config-file /tmp/boot/boot/grub.conf")
+               cmd.append("--boot-filesystem=/dev/sda1")
             self.subprocess_call(cmd, fake_it=self.dryrun)
 
             if loader == "--lilo":
diff --git a/live/base.cfg b/live/base.cfg
index daece28..44b002e 100644
--- a/live/base.cfg
+++ b/live/base.cfg
@@ -28,7 +28,7 @@ part swap --size=1027 --ondisk=/dev/sda --asprimary
 
 %packages
 @base
- at core
+#@core
 @hardware-support
 syslinux
 kernel
@@ -63,7 +63,7 @@ koan
 -xsane-gimp
 # while hplip requires pyqt, it has to go
 -hplip
--*debuginfo
+#-*debuginfo # error
 
 %post
 
@@ -118,9 +118,31 @@ mkdir -p /tmp/boot/boot
 # install grub
 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
+# grub.conf
+default=0
+timeout=5
+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
+EGRUB
+
 # now we're ready
 INSERT_KOAN_ARGS --livecd
 
+# however the config file needs to be moved 
+cp /boot/grub/grub.conf /tmp/boot/boot/grub/grub.conf
+
+# FIXME: fix file contents in /tmp/boot/boot/grub/grub.conf
+# so paths don't start with t/
+
+# eject
+# reboot
+
 EOF
 
 chmod 755 /etc/rc.d/init.d/fedora-live
@@ -130,4 +152,3 @@ chmod 755 /etc/rc.d/init.d/fedora-live
 # save a little bit of space at least...
 rm -f /boot/initrd*
 
-

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