kadischi/livecd_generator kadischi.py,1.57,1.58

Jasper O'neal Hartline (autopsy) fedora-extras-commits at redhat.com
Sun Apr 22 18:51:12 UTC 2007


Author: autopsy

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

Modified Files:
	kadischi.py 
Log Message:
Addition of install.desktop for LiveCD to HDD installer, some minor fixes.


Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kadischi.py	17 Apr 2007 04:30:02 -0000	1.57
+++ kadischi.py	22 Apr 2007 18:51:09 -0000	1.58
@@ -165,8 +165,7 @@
 
     # run post_install_scripts
     if os.access("/.livecd", os.R_OK):
-        print "[kadischi]: Please reboot your system and remove"
-        print "[kadischi]: the LiveCD or LiveDVD media to start Fedora Core"
+        print "[kadischi]: Please reboot your system and remove the LiveCD or LiveDVD media to start Fedora Core \n"
         sys.exit(0)
     else:
         print "[kadischi]: running post installation scripts"
@@ -316,7 +315,11 @@
 
 def requirements():
     """ Searches which Requires has not yet installed """
-    required_rpms = ('anaconda', 'busybox-anaconda', 'mkisofs', 'syslinux', 'e2fsprogs', 'squashfs-tools', 'perl')
+    if os.access("/.livecd", os.R_OK):
+        required_rpms = ('anaconda', 'e2fsprogs', 'perl', 'grub'
+    else:
+        required_rpms = ('anaconda', 'busybox-anaconda', 'mkisofs', 'syslinux', 'e2fsprogs', 'squashfs-tools', 'perl')
+    
     missing_rpms = check_installed_rpms ('/', required_rpms, False)
 
     if len (missing_rpms) != 0:




More information about the scm-commits mailing list