[Erp5-report] r12459 - /umigumi/trunk/config/erp5_cd.py

[nobody at svn.erp5.org]

Author: kevin
Date: Tue Jan 30 16:02:22 2007
New Revision: 12459

URL: http://svn.erp5.org?rev=12459&view=rev
Log:
* Start oood just after dm
* But add new sleep to let dm finish its initialization
* Bump build
* Reduce some oood timeout

Modified:
    umigumi/trunk/config/erp5_cd.py

Modified: umigumi/trunk/config/erp5_cd.py
URL: http://svn.erp5.org/umigumi/trunk/config/erp5_cd.py?rev=12459&r1=12458&r2=12459&view=diff
==============================================================================
--- umigumi/trunk/config/erp5_cd.py (original)
+++ umigumi/trunk/config/erp5_cd.py Tue Jan 30 16:02:22 2007
@@ -25,7 +25,7 @@
 # Metadatas
 description = """ERP5 LiveCD demonstrates the power of the Open Source ERP Software, ERP5."""
 canonical_name = 'ERP5 LiveCD'
-version = '1.0rc11-build18'
+version = '1.0rc11-build19'
 
 ### Kernels
 # TODO: generate both 32bit and 64bit version of the liveCD.
@@ -92,9 +92,18 @@
   , 'ln -sf /etc/kde /usr/share/config'
 
   # Start dm later.
-  # This will give erp5cdtool and oood service the time to do their job without being disturbed.
+  # This will give erp5cdtool service the time to do its job without being disturbed.
   , 'rm -f /etc/rc.d/rc5.d/S30dm'
-  , 'ln -sn /etc/rc.d/init.d/dm /etc/rc.d/rc5.d/S99dm'
+  , 'ln -sn /etc/rc.d/init.d/dm /etc/rc.d/rc5.d/S98dm'
+  # Launch oood at end
+  , 'rm -f /etc/rc.d/rc2.d/S29oood'
+  , 'rm -f /etc/rc.d/rc3.d/S29oood'
+  , 'rm -f /etc/rc.d/rc4.d/S29oood'
+  , 'rm -f /etc/rc.d/rc5.d/S29oood'
+  , 'ln -sn /etc/rc.d/init.d/oood /etc/rc.d/rc2.d/S99oood'
+  , 'ln -sn /etc/rc.d/init.d/oood /etc/rc.d/rc3.d/S99oood'
+  , 'ln -sn /etc/rc.d/init.d/oood /etc/rc.d/rc4.d/S99oood'
+  , 'ln -sn /etc/rc.d/init.d/oood /etc/rc.d/rc5.d/S99oood'
 
   # Better to use sed rather than custom files.
   , 'sed -i -e "s/^Country=.*/Country=us/" -e "s/^Language=.*/Language=en_US:en/" -e "s/^Charset=.*/Charset=iso10646-1/" /etc/kde/kdeglobals'
@@ -156,9 +165,10 @@
   , 'mv -f /var/spool/postfix /etc/postfix/chroot'
   , "grep -RIl '/var/spool/postfix' /etc/ | xargs -i sed -i -e 's/\/var\/spool\/postfix/\/etc\/postfix\/chroot/g' {}"
 
-  # Increase oood timeouts for the live CD because CDROM are slower than HDD !
-  , 'sed -i -e "s/instance_load_time    = 120/instance_load_time    = 210/g" /etc/oood/config.py'
-  , 'sed -i -e "s/sleep 10/sleep 30/g" /etc/rc.d/init.d/oood'
+  # Increase and add some oood timeouts for the live CD because CDROM are slower than HDD !
+  , 'sed -i -e "s/# Initialize the Pool/# Initialize the Pool\\n  sleep 90 # Hack for Live CD: wait a bit to let dm service start completely, else oood will fail to run/g" /etc/rc.d/init.d/oood'
+  , 'sed -i -e "s/instance_load_time    = 120/instance_load_time    = 180/g" /etc/oood/config.py'
+  , 'sed -i -e "s/sleep 10/sleep 20/g" /etc/rc.d/init.d/oood'
   )
 
 # A list of hint packages (packages which are required to proceed to preparation)