Re: Ubuntu Patches [4/16]
Phillip Susi <[email protected]> Sat, 19 Mar 2011 13:50:23 -0400
| Newsgroups | gmane.linux.ataraid |
|---|---|
| Message-ID | <[email protected]> |
Repost: formalized the description and cleaned up stylistic errors _______________________________________________ Ataraid-list mailing list [email protected] https://www.redhat.com/mailman/listinfo/ataraid-list
24_drop_p_for_partition_conditional.patch
(text/x-patch, 1.1 KB)
From: Phillip Susi <[email protected]> Last-Update: 2011-03-08 Description: dmraid was changed at one point to insert a 'p' between the base device name and the partition number. For some time debian and ubuntu reversed this change. This patch modifies the behavior to add the 'p' iff the last character of the base name is a digit. This makes dmraid comply with the behavior used by kpartx and "by linux since the dawn of time". Forwarded: Yes Index: b/1.0.0.rc16/lib/format/partition/dos.c =================================================================== --- a/1.0.0.rc16/lib/format/partition/dos.c +++ b/1.0.0.rc16/lib/format/partition/dos.c @@ -31,8 +31,14 @@ { const char *base = get_basename(lc, rd->di->path); - return type ? snprintf(str, len, "%s%s%u", base, OPT_STR_PARTCHAR(lc), - partition) : snprintf(str, len, "%s", base); + if (type) + { + if (isdigit(base[strlen(base) - 1])) + return snprintf(str, len, "%s%s%u", base, + OPT_STR_PARTCHAR(lc), partition); + else return snprintf(str, len, "%s%u", base, partition); + } + else return snprintf(str, len, "%s", base); } static char *
signature.asc
(application/pgp-signature, 262 B)
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk2E7OIACgkQJ4UciIs+XuKFVgCgvMSpwsm9+efgbs23TbST2jjq msYAn3Tso9c5mEAGyH6bUF0UXt49+oA8 =111/ -----END PGP SIGNATURE-----