[Fedora-livecd-list] tools/livecd-iso-to-disk.sh

2008-04-03 Thread Jeremy Katz
 tools/livecd-iso-to-disk.sh |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d69237bcf038ca91ba5e12a9a1d8508b2159183f
Author: Jeremy Katz [EMAIL PROTECTED]
Date:   Thu Apr 3 11:06:34 2008 -0400

Ensure we copy osmin.img from the right path.

diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 0302bcf..0b70eff 100644
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -232,8 +232,8 @@ elif [ -f $CDMNT/LiveOS/ext3fs.img ]; then
 elif [ -f $CDMNT/ext3fs.img ]; then
 cp $CDMNT/ext3fs.img $USBMNT/LiveOS/ext3fs.img || exitclean 
 fi
-if [ -f $CDMNT/osmin.img ]; then
-cp $CDMNT/osmin.img $USBMNT/LiveOS/osmin.img || exitclean
+if [ -f $CDMNT/LiveOS/osmin.img ]; then
+cp $CDMNT/LiveOS/osmin.img $USBMNT/LiveOS/osmin.img || exitclean
 fi
 
 cp $CDMNT/isolinux/* $USBMNT/$SYSLINUXPATH


--
Fedora-livecd-list mailing list
Fedora-livecd-list@redhat.com
https://www.redhat.com/mailman/listinfo/fedora-livecd-list


[Fedora-livecd-list] imgcreate/kickstart.py

2008-04-03 Thread Jeremy Katz
 imgcreate/kickstart.py |   25 +
 1 file changed, 17 insertions(+), 8 deletions(-)

New commits:
commit 7c1246ff21f5be35ef2ac470bd62378f079cb39e
Author: Jeremy Katz [EMAIL PROTECTED]
Date:   Thu Apr 3 16:57:28 2008 -0400

Handle the fact that upstart doesn't use inittab

diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index 30156d8..ebee1b4 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -208,14 +208,23 @@ class ServicesConfig(KickstartConfig):
 class XConfig(KickstartConfig):
 A class to apply a kickstart X configuration to a system.
 def apply(self, ksxconfig):
-if not ksxconfig.startX:
-return
-f = open(self.path(/etc/inittab), rw+)
-buf = f.read()
-buf = buf.replace(id:3:initdefault, id:5:initdefault)
-f.seek(0)
-f.write(buf)
-f.close()
+if os.path.exists(self.path(/etc/inittab)) and ksxconfig.startX:
+f = open(self.path(/etc/inittab), rw+)
+buf = f.read()
+buf = buf.replace(id:3:initdefault, id:5:initdefault)
+f.seek(0)
+f.write(buf)
+f.close()
+
+# sigh.  with upstart, we no longer use inittab
+if os.path.exists(self.path(/etc/sysconfig/init)) and not 
ksxconfig.startX:
+f = open(self.path(/etc/sysconfig/init), rw+)
+buf = f.read()
+buf = buf.replace(GRAPHICAL=yes, GRAPHICAL=no)
+f.seek(0)
+f.write(buf)
+f.close()
+
 
 class NetworkConfig(KickstartConfig):
 A class to apply a kickstart network configuration to a system.


--
Fedora-livecd-list mailing list
Fedora-livecd-list@redhat.com
https://www.redhat.com/mailman/listinfo/fedora-livecd-list


[Fedora-livecd-list] config/livecd-fedora-kde.ks

2008-04-03 Thread Sebastian Vahl
 config/livecd-fedora-kde.ks |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 9d49595062aeaa716fde93a96284b899bd36ca10
Author: Sebastian Vahl [EMAIL PROTECTED]
Date:   Thu Apr 3 23:40:26 2008 +0200

remove ktorrent for space issues

diff --git a/config/livecd-fedora-kde.ks b/config/livecd-fedora-kde.ks
index 9b24fc4..44e3b92 100644
--- a/config/livecd-fedora-kde.ks
+++ b/config/livecd-fedora-kde.ks
@@ -4,7 +4,6 @@
 @kde-desktop
 
 # include nm-applet directly 
--knetworkmanager
 NetworkManager-gnome
 
 # unwanted packages from @kde-desktop
@@ -15,7 +14,7 @@ NetworkManager-gnome
 -digikam
 -kdeedu
 -scribus
-#-ktorrent
+-ktorrent
 #-kdegames
 
 # KDE 3
@@ -30,7 +29,6 @@ filelight
 
 # some extras
 fuse
-dvd+rw-tools
 
 # additional fonts
 @fonts


--
Fedora-livecd-list mailing list
Fedora-livecd-list@redhat.com
https://www.redhat.com/mailman/listinfo/fedora-livecd-list