← Back to branch summary

~ubuntu-branches/ubuntu/wily/udisks/wily

« back to all changes in this revision

Viewing changes to src/helpers/job-mkfs.c

  • Committer: Package Import Robot
  • Author(s): Michael Biebl
  • Date: 2012-07-20 11:39:01 UTC
  • Revision ID: package-import@ubuntu.com-20120720113901-v00iwjwwykpn124u
Tags: 1.0.4-7
http://bugs.debian.org/680683
debian/patches/13-dosfslabel.patch: The original reasons why mlabel was
preferred over dosfslabel are no longer true. So switch back to dosfslabel
which is part of dosfstools which we already require for mkfs.vfat and
drop the Recommends on mtools. Fix the maximum length for FAT labels while
at it. (Closes: #680683)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/helpers/job-mkfs.c
109
109
          if (g_str_has_prefix (options[n], "label="))
110
110
            {
111
111
              label = strdup (options[n] + sizeof("label=") - 1);
112
 
              if (!validate_and_escape_label (&label, 254))
 
112
              if (!validate_and_escape_label (&label, 11))
113
113
                {
114
114
                  g_string_free (s, TRUE);
115
115
                  goto out;
498
498
 
499
499
      if (strcmp (fstype, "vfat") == 0)
500
500
        {
501
 
          command_line = g_strdup_printf ("mlabel -i %s \"::%s\"", device, label);
 
501
          command_line = g_strdup_printf ("dosfslabel %s \"%s\"", device, label);
502
502
        }
503
503
      else
504
504
        {