--- trunk/create-clonezilla-sysresccd/create-clonezilla-sysresccd.sh	2011/05/31 19:45:21	176
+++ trunk/create-clonezilla-sysresccd/create-clonezilla-sysresccd.sh	2011/06/03 17:27:54	178
@@ -773,11 +773,11 @@
 #   echo 'done'
   
   if [ ! -z "$splash" ];then
-   echo -n "Copying new spalsh screen...   "
-   cp -L "$splash" "$SAVE_DIR"/tmp/clonezilla-sysresccd/isolinux/ocswp.png
-   echo 'done'
+    echo -n "Copying new spalsh screen...   "
+    cp -L "$splash" "$SAVE_DIR"/tmp/clonezilla-sysresccd/isolinux/ocswp.png
+    echo 'done'
   else
-   cp -L /root/.clonezilla-sysresccd/files/default-ocswp.png "$SAVE_DIR"/tmp/clonezilla-sysresccd/isolinux/ocswp.png
+    cp -L /root/.clonezilla-sysresccd/files/default-ocswp.png "$SAVE_DIR"/tmp/clonezilla-sysresccd/isolinux/ocswp.png
   fi
 
   echo -n "Copying Super Grub Disk...   "
@@ -824,7 +824,12 @@
   cd /root/.clonezilla-sysresccd/files
   cp -L pre* ocs-iso what-cd patch-clonezilla-sysresccd continue-multi-cd isolinux-restore-cd.cfg \
     isolinux-restore-cd-ram.cfg menu-for-iso.tar.gz doc.tar.gz imginfo imgconvert cust-menu "$SAVE_DIR"/tmp/clonezilla-sysresccd/restorecd
-  cp -L default-restore-ocswp.png "$SAVE_DIR"/tmp/clonezilla-sysresccd/restorecd/ocswp.png
+  fsplash=`basename "$splash"`
+  if [ "$fsplash" = "default-ocswp-i686.png" ] || [ "$fsplash" = "default-ocswp-i486.png" ] || [ "$fsplash" = "default-ocswp-amd64.png" ];then
+    cp $(echo "$splash" | sed 's/default/default-restore/') "$SAVE_DIR"/tmp/clonezilla-sysresccd/restorecd/ocswp.png
+  else
+    cp -L default-restore-ocswp.png "$SAVE_DIR"/tmp/clonezilla-sysresccd/restorecd/ocswp.png
+  fi
   cp sbminst "$SAVE_DIR"/tmp/clonezilla-sysresccd/restorecd
   
   # Copy Smart Boot Manager and rawrite-fdimage to bootdisk
@@ -868,37 +873,39 @@
 
   if [ ! -z "$exScript" ];then
 #    echo -n "Executing external script: \"$exScript\"...   "
-   echo -n "Executing external script...   "
-   . "$exScript" || {
-    echo
-    echo
-    echo
-    echo "    Error: The execution of the script failed!!!"
-    echo "           Please correct it and try again"
-    echo
-    echo "    Script: \"$exScript\""
-    cleanUp
-    exit 1
-   }
-  echo 'done'
+    echo -n "Executing external script...   "
+    . "$exScript" || {
+      echo
+      echo
+      echo
+      echo "    Error: The execution of the script failed!!!"
+      echo "           Please correct it and try again"
+      echo
+      echo "    Script: \"$exScript\""
+      cleanUp
+      exit 1
+    }
+    echo 'done'
   fi
 #   echo
 #   echo
 #   echo
- else
-  trap cleanUp 2
-  cleanUpValue=1
-  if [ ! -d  "$SAVE_DIR"/tmp/clonezilla-sysresccd ];then
-   echo "    Error accessing folder \""$SAVE_DIR"/tmp/clonezilla-sysresccd\""
-   exitStatus=1
-   cleanUp
+  else
+    trap cleanUp 2
+    cleanUpValue=1
+    if [ ! -d  "$SAVE_DIR"/tmp/clonezilla-sysresccd ];then
+      echo "    Error accessing folder \""$SAVE_DIR"/tmp/clonezilla-sysresccd\""
+      exitStatus=1
+      cleanUp
+    fi
   fi
- fi
 
  # move extra folders into utils
  mv "$SAVE_DIR"/tmp/clonezilla-sysresccd/rawrite "$SAVE_DIR"/tmp/clonezilla-sysresccd/bootprog "$SAVE_DIR"/tmp/clonezilla-sysresccd/utils
  mv "$SAVE_DIR"/tmp/clonezilla-sysresccd/version "$SAVE_DIR"/tmp/clonezilla-sysresccd/SystemRescueCD-Version
 
+  # copy png files from isolinux/ to syslinux/
+  cp  "$SAVE_DIR"/tmp/clonezilla-sysresccd/isolinux/*.png "$SAVE_DIR"/tmp/clonezilla-sysresccd/syslinux
 #
 # re-build clonezilla filesystem.squashfs
 #