kadischi/conf Makefile.am,1.8,1.9 kadischi.conf,1.3,1.4

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

Update of /cvs/devel/kadischi/conf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23828/kadischi/conf

Modified Files:
	Makefile.am kadischi.conf 
Log Message:
Add Grub/Isolinux configuration for bootloader


Index: Makefile.am
===================================================================
RCS file: /cvs/devel/kadischi/conf/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.am	3 Jul 2006 19:10:25 -0000	1.8
+++ Makefile.am	18 Sep 2006 05:45:26 -0000	1.9
@@ -4,8 +4,7 @@
 install-data-hook:
 	sed -i -e 's|# INSTALLDIR=|INSTALLDIR=$(pkgdatadir)|' $(DESTDIR)$(confdir)/kadischi.conf
 	sed -i -e 's|# LIBEXECDIR=|LIBEXECDIR=$(libexecdir)|' $(DESTDIR)$(confdir)/kadischi.conf
-#	echo INSTALLDIR=$(pkgdatadir) >> $(DESTDIR)$(confdir)/kadischi.conf
-#	echo LIBEXECDIR=$(libexecdir) >> $(DESTDIR)$(confdir)/kadischi.conf
+	sed -i -e 's|# BOOTLOADER=|BOOTLOADER=|' $(DESTDIR)$(confdir)/kadischi.conf
 
 uninstall-hook:
 	rm -rf $(confdir)/*~


Index: kadischi.conf
===================================================================
RCS file: /cvs/devel/kadischi/conf/kadischi.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kadischi.conf	4 Jul 2006 14:47:31 -0000	1.3
+++ kadischi.conf	18 Sep 2006 05:45:26 -0000	1.4
@@ -8,3 +8,8 @@
 # LIBEXECDIR directive specifies where Kadischi's arch specific binaries find-live-cd and
 # scanswap are to be installed
 # LIBEXECDIR=
+
+
+# BOOTLOADER directive simply sets what bootloader should be used for the LiveCD.
+# Valid options are "grub" or "isolinux".
+# BOOTLOADER=