040-petitboot-mount-ufs2.diff

   1 --- a/discover/device-handler.c 2012-01-25 19:35:09.000000000 +0100
   2 +++ b/discover/device-handler.c 2012-01-28 23:53:27.789435288 +0100
   3 @@ -183,7 +183,7 @@
   4  static int mount_device(struct discover_context *ctx)
   5  {
   6         const char *mountpoint;
   7 -       const char *argv[6];
   8 +       const char *argv[8];
   9
  10         if (!ctx->mount_path) {
  11                 mountpoint = mountpoint_for_device(ctx->device_path);
  12 @@ -201,9 +201,23 @@
  13         argv[4] = "ro";
  14         argv[5] = NULL;
  15
  16 +       if (!pb_run_cmd(argv))
  17 +               goto mounted;
  18 +
  19 +       argv[0] = MOUNT_BIN;
  20 +       argv[1] = ctx->device_path;
  21 +       argv[2] = ctx->mount_path;
  22 +       argv[3] = "-t";
  23 +       argv[4] = "ufs";
  24 +       argv[5] = "-o";
  25 +       argv[6] = "ro,ufstype=ufs2";
  26 +       argv[7] = NULL;
  27 +
  28         if (pb_run_cmd(argv))
  29                 goto out_rmdir;
  30
  31 +mounted:
  32 +
  33         setup_device_links(ctx);
  34         return 0;
  35