[maemo-commits] [maemo-commits] r18953 - in projects/haf/tags/ke-recv/3.19-1fixes: debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-07-23 10:22:30 +0300 (Thu, 23 Jul 2009)
New Revision: 18953

Modified:
   projects/haf/tags/ke-recv/3.19-1fixes/debian/changelog
   projects/haf/tags/ke-recv/3.19-1fixes/src/events.c
   projects/haf/tags/ke-recv/3.19-1fixes/src/ke-recv.c
   projects/haf/tags/ke-recv/3.19-1fixes/src/osso-mmc-mount.sh
Log:
revert the part. layout fix


Modified: projects/haf/tags/ke-recv/3.19-1fixes/debian/changelog
===================================================================
--- projects/haf/tags/ke-recv/3.19-1fixes/debian/changelog	2009-07-22 14:28:47 UTC (rev 18952)
+++ projects/haf/tags/ke-recv/3.19-1fixes/debian/changelog	2009-07-23 07:22:30 UTC (rev 18953)
@@ -2,7 +2,7 @@
 
   * Fixes: NB#127339 - AppCert-ke-recv doesn't export card if the partition
     format isn't recognized
-  * Fixes: NB#128388 - vfat should sit at the first partition
+  * Fixes: NB#122833 - dosfsck should be removed from device mount
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed, 22 Jul 2009 15:50:52 +0300
 

Modified: projects/haf/tags/ke-recv/3.19-1fixes/src/events.c
===================================================================
--- projects/haf/tags/ke-recv/3.19-1fixes/src/events.c	2009-07-22 14:28:47 UTC (rev 18952)
+++ projects/haf/tags/ke-recv/3.19-1fixes/src/events.c	2009-07-23 07:22:30 UTC (rev 18953)
@@ -904,18 +904,30 @@
 static int mount_volumes(mmc_info_t *mmc, gboolean show_errors)
 {
         const char *mount_args[] = {MMC_MOUNT_COMMAND, NULL, NULL, NULL};
-        volume_list_t *l, *l_on_first_try = NULL;
+        volume_list_t *l;
         const char *udi = NULL, *device = NULL;
         int ret, count = 0;
        
         l = get_nth_volume(mmc, mmc->preferred_volume);
+        /*
+        if (l && l->corrupt) {
+                ULOG_DEBUG_F("partition %d is corrupt",
+                             mmc->preferred_volume);
+                return 0;
+        }
+        */
 
         if (l == NULL || l->udi == NULL) {
                 ULOG_DEBUG_F("partition %d not found", mmc->preferred_volume);
-                return 0;
+                if (mmc->preferred_volume != 1 && mmc->internal_card) {
+                        /* workaround for not yet partitioned systems */
+                        ULOG_DEBUG_F("falling back to partition 1!");
+                        l = get_nth_volume(mmc, 1);
+                        if (l == NULL || l->udi == NULL)
+                                return 0;
+                } else
+                        return 0;
         }
-
-try_again:
         udi = l->udi;
         device = l->dev_name;
 
@@ -950,21 +962,6 @@
         } else {
                 /* corrupt beyond mounting, or unsupported format */
                 ULOG_DEBUG_F("exec_prog returned %d", ret);
-
-                if (!l_on_first_try && l->volume_number == 1 &&
-                    mmc->internal_card) {
-                        /* try partition 3 for not yet partitioned systems */
-                        ULOG_DEBUG_F("falling back to partition 3");
-                        l_on_first_try = l;
-                        l = get_nth_volume(mmc, 3);
-                        if (l == NULL || l->udi == NULL)
-                                l = l_on_first_try;
-                        else
-                                goto try_again;
-                } else if (l_on_first_try)
-                        /* the partition on first try was just corrupt */
-                        l = l_on_first_try;
-
                 l->mountpoint = NULL;
                 l->corrupt = 1;
                 inform_mmc_swapping(FALSE, mmc);

Modified: projects/haf/tags/ke-recv/3.19-1fixes/src/ke-recv.c
===================================================================
--- projects/haf/tags/ke-recv/3.19-1fixes/src/ke-recv.c	2009-07-22 14:28:47 UTC (rev 18952)
+++ projects/haf/tags/ke-recv/3.19-1fixes/src/ke-recv.c	2009-07-23 07:22:30 UTC (rev 18953)
@@ -1569,7 +1569,7 @@
                 mmc->swap_off_op = INTERNAL_MMC_SWAP_OFF_OP;
 
 #ifdef FREMANTLE_MODE
-                mmc->preferred_volume = 1;
+                mmc->preferred_volume = 3;
                 mmc->control_partitions = 0;
 #else
                 mmc->preferred_volume = 1;

Modified: projects/haf/tags/ke-recv/3.19-1fixes/src/osso-mmc-mount.sh
===================================================================
--- projects/haf/tags/ke-recv/3.19-1fixes/src/osso-mmc-mount.sh	2009-07-22 14:28:47 UTC (rev 18952)
+++ projects/haf/tags/ke-recv/3.19-1fixes/src/osso-mmc-mount.sh	2009-07-23 07:22:30 UTC (rev 18953)
@@ -54,18 +54,18 @@
 fi
 
 # time limited check
-/sbin/dosfsck -I -n -T 10 $PDEV
-if [ $? != 0 ]; then
-  logger "$0: $PDEV is corrupt, trying to mount it read-only"
-  mmc-mount $PDEV $MP ro
-  if [ $? = 0 ]; then
-    logger "$0: $PDEV mounted read-only"
-    exit 2
-  else
-    logger "$0: Couldn't mount $PDEV read-only"
-    exit 1
-  fi
-fi
+#/sbin/dosfsck -I -n -T 10 $PDEV
+#if [ $? != 0 ]; then
+#  logger "$0: $PDEV is corrupt, trying to mount it read-only"
+#  mmc-mount $PDEV $MP ro
+#  if [ $? = 0 ]; then
+#    logger "$0: $PDEV mounted read-only"
+#    exit 2
+#  else
+#    logger "$0: Couldn't mount $PDEV read-only"
+#    exit 1
+#  fi
+#fi
 
 mmc-mount $PDEV $MP rw
 RC=$?
@@ -77,7 +77,6 @@
     for d in .sounds .videos .documents .images .camera; do
       mkdir -p $MP/$d
     done
-    touch $MP
   elif [ "x$MP" = "x/home/user/MyDocs" ]; then
     logger "$0: '$MP' is not writable"
   fi