--- rc.M1	2008-05-24 15:47:04.000000000 +0200
+++ rc.M	2008-05-24 15:49:18.000000000 +0200
@@ -14,8 +14,8 @@
 # Tell the viewers what's going to happen.
 echo "Going multiuser..."
 
-# Update all the shared library links:
-if [ -x /sbin/ldconfig ]; then
+# Update all the shared library links: hack_T
+if [ -x /sbin/ldconfig -a -x /etc/rc.d/upgradeboot  ]; then
   echo "Updating shared library links:  /sbin/ldconfig &"
   /sbin/ldconfig &
 fi
@@ -67,7 +67,7 @@
 fi
 
 # Update the X font indexes:
-if [ -x /usr/bin/fc-cache ]; then
+if [ -x /usr/bin/fc-cache -a -x /etc/rc.d/upgradeboot ]; then
   echo "Updating X font indexes:  /usr/bin/fc-cache -f &"
   /usr/bin/fc-cache -f &
 fi
@@ -129,28 +129,32 @@
   . /etc/rc.d/rc.acpid start
 fi
 
-# Update any existing icon cache files:
-if find /usr/share/icons 2> /dev/null | grep -q icon-theme.cache ; then
-  for theme_dir in /usr/share/icons/* ; do
-    if [ -r ${theme_dir}/icon-theme.cache ]; then
-      echo "Updating icon-theme.cache in ${theme_dir}..."
-      /usr/bin/gtk-update-icon-cache -t -f ${theme_dir} 1> /dev/null 2> /dev/null
-    fi
-  done
-  # This would be a large file and probably shouldn't be there, but if it is
-  # then it must be kept updated, too:
-  if [ -r /usr/share/icons/icon-theme.cache ]; then
-    echo "Updating icon-theme.cache in /usr/share/icons..."
-    /usr/bin/gtk-update-icon-cache -t -f /usr/share/icons 1> /dev/null 2> /dev/null
-  fi
-fi
+#hack_T
 
-# Update mime database:
-if [ -x /usr/bin/update-mime-database -a -d /usr/share/mime ]; then
-  echo "Updating MIME database:  /usr/bin/update-mime-database /usr/share/mime &"
-  /usr/bin/update-mime-database /usr/share/mime &
+if [ -x /etc/rc.d/upgradeboot ]; then
+   # Update any existing icon cache files:
+   if find /usr/share/icons 2> /dev/null | grep -q icon-theme.cache ; then
+     for theme_dir in /usr/share/icons/* ; do
+       if [ -r ${theme_dir}/icon-theme.cache  ]; then
+         echo "Updating icon-theme.cache in ${theme_dir}..."
+         /usr/bin/gtk-update-icon-cache -t -f ${theme_dir} 1> /dev/null 2> /dev/null
+       fi
+     done
+     # This would be a large file and probably shouldn't be there, but if it is
+     # then it must be kept updated, too:
+     if [ -r /usr/share/icons/icon-theme.cache ]; then
+       echo "Updating icon-theme.cache in /usr/share/icons..."
+       /usr/bin/gtk-update-icon-cache -t -f /usr/share/icons 1> /dev/null 2> /dev/null
+     fi
+   fi
+   
+
+   # Update mime database:
+   if [ -x /usr/bin/update-mime-database -a -d /usr/share/mime ]; then
+     echo "Updating MIME database:  /usr/bin/update-mime-database /usr/share/mime &"
+     /usr/bin/update-mime-database /usr/share/mime &
+   fi
 fi
-
 # Start D-Bus:
 if [ -x /etc/rc.d/rc.messagebus ]; then
   sh /etc/rc.d/rc.messagebus start
@@ -166,8 +170,8 @@
   sh /etc/rc.d/rc.bluetooth start
 fi
 
-# SCIM and other GTK+ input methods like this file kept updated:
-if [ -x /usr/bin/gtk-query-immodules-2.0 ]; then
+# SCIM and other GTK+ input methods like this file kept updated: hack_T
+if [ -x /usr/bin/gtk-query-immodules-2.0 -a -x /etc/rc.d/upgradeboot  ]; then
   echo "Updating gtk.immodules:  gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules"
   /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules 2> /dev/null
 fi