Ubuntu
partman-base package

Merge lp:~jm-leddy/ubuntu/precise/partman-base/4k-sectors into lp:~ubuntu-core-dev/partman-base/precise-proposed

  1. Precise (12.04)
  2. 4k-sectors
  3. Merge into precise-proposed
Proposed by James M. Leddy
Status: Merged
Merged at revision: 1368
Proposed branch: lp:~jm-leddy/ubuntu/precise/partman-base/4k-sectors
Merge into: lp:~ubuntu-core-dev/partman-base/precise-proposed
Diff against target: 157 lines (+34/-30)
3 files modified
debian/changelog (+7/-3)
parted_devices.c (+1/-1)
parted_server.c (+26/-26)
To merge this branch: bzr merge lp:~jm-leddy/ubuntu/precise/partman-base/4k-sectors
Reviewer Review Type Date Requested Status
Colin Watson Approve
Review via email: mp+179559@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2012-07-02 14:00:04 +0000
+++ debian/changelog 2013-08-10 01:03:33 +0000
@@ -1,3 +1,10 @@
1partman-base (153ubuntu6) precise-proposed; urgency=low
2
3 * Use the device's logical sector size throughout rather than
4 PED_SECTOR_SIZE_DEFAULT (LP: #1065281).
5
6 -- James M Leddy <james.leddy@canonical.com> Fri, 09 Aug 2013 20:38:09 -0400
7
1partman-base (153ubuntu5) precise-proposed; urgency=low8partman-base (153ubuntu5) precise-proposed; urgency=low
29
3 * Permit non-cylinder alignment again on GPT (closes: #674894,10 * Permit non-cylinder alignment again on GPT (closes: #674894,
@@ -4488,6 +4495,3 @@
44884495
4489 -- Anton Zinoviev <zinoviev@debian.org> Wed, 27 Aug 2003 07:03:28 +02004496 -- Anton Zinoviev <zinoviev@debian.org> Wed, 27 Aug 2003 07:03:28 +0200
44904497
4491Local Variables:
4492coding: utf-8
4493End:
44944498
=== modified file 'parted_devices.c'
--- parted_devices.c 2011-09-23 14:31:46 +0000
+++ parted_devices.c 2013-08-10 01:03:33 +0000
@@ -82,7 +82,7 @@
82 return;82 return;
83 printf("%s\t%lli\t%s\n",83 printf("%s\t%lli\t%s\n",
84 dev->path,84 dev->path,
85 dev->length * PED_SECTOR_SIZE_DEFAULT,85 dev->length * dev->sector_size,
86 dev->model);86 dev->model);
87}87}
8888
8989
=== modified file 'parted_server.c'
--- parted_server.c 2012-07-02 13:54:37 +0000
+++ parted_server.c 2013-08-10 01:03:33 +0000
@@ -1061,8 +1061,8 @@
1061 log("partition_with_id(%s)", id);1061 log("partition_with_id(%s)", id);
1062 if (2 != sscanf(id, "%lli-%lli", &start, &end))1062 if (2 != sscanf(id, "%lli-%lli", &start, &end))
1063 critical_error("Bad id %s", id);1063 critical_error("Bad id %s", id);
1064 start_sector = start / PED_SECTOR_SIZE_DEFAULT;1064 start_sector = start / disk->dev->sector_size;
1065 end_sector = (end - PED_SECTOR_SIZE_DEFAULT + 1) / PED_SECTOR_SIZE_DEFAULT;1065 end_sector = (end - disk->dev->sector_size + 1) / disk->dev->sector_size;
1066 if (disk == NULL)1066 if (disk == NULL)
1067 return NULL;1067 return NULL;
1068 for (part = NULL;1068 for (part = NULL;
@@ -1147,9 +1147,9 @@
1147 name = "";1147 name = "";
1148 result = xasprintf("%i\t%lli-%lli\t%lli\t%s\t%s\t%s\t%s",1148 result = xasprintf("%i\t%lli-%lli\t%lli\t%s\t%s\t%s\t%s",
1149 part->num,1149 part->num,
1150 (part->geom).start * PED_SECTOR_SIZE_DEFAULT,1150 (part->geom).start * disk->dev->sector_size,
1151 (part->geom).end * PED_SECTOR_SIZE_DEFAULT + PED_SECTOR_SIZE_DEFAULT - 1,1151 (part->geom).end * disk->dev->sector_size + disk->dev->sector_size - 1,
1152 (part->geom).length * PED_SECTOR_SIZE_DEFAULT, type, fs, path, name);1152 (part->geom).length * disk->dev->sector_size, type, fs, path, name);
1153 free(path);1153 free(path);
1154 return result;1154 return result;
1155}1155}
@@ -2026,16 +2026,16 @@
2026 free(s_fs_type);2026 free(s_fs_type);
20272027
2028 if (!strcasecmp(position, "full")) {2028 if (!strcasecmp(position, "full")) {
2029 part_start = range_start / PED_SECTOR_SIZE_DEFAULT;2029 part_start = range_start / dev->sector_size;
2030 part_end = ((range_end - PED_SECTOR_SIZE_DEFAULT + 1)2030 part_end = ((range_end - dev->sector_size + 1)
2031 / PED_SECTOR_SIZE_DEFAULT);2031 / dev->sector_size);
2032 } else if (!strcasecmp(position, "beginning")) {2032 } else if (!strcasecmp(position, "beginning")) {
2033 part_start = range_start / PED_SECTOR_SIZE_DEFAULT;2033 part_start = range_start / dev->sector_size;
2034 part_end = (range_start + length) / PED_SECTOR_SIZE_DEFAULT;2034 part_end = (range_start + length) / dev->sector_size;
2035 } else if (!strcasecmp(position, "end")) {2035 } else if (!strcasecmp(position, "end")) {
2036 part_start = (range_end - length) / PED_SECTOR_SIZE_DEFAULT;2036 part_start = (range_end - length) / dev->sector_size;
2037 part_end = ((range_end - PED_SECTOR_SIZE_DEFAULT + 1)2037 part_end = ((range_end - dev->sector_size + 1)
2038 / PED_SECTOR_SIZE_DEFAULT);2038 / dev->sector_size);
2039 } else2039 } else
2040 critical_error("Bad position: %s", position);2040 critical_error("Bad position: %s", position);
2041 free(position);2041 free(position);
@@ -2113,7 +2113,7 @@
2113 critical_error("Expected new size");2113 critical_error("Expected new size");
2114 log("New size: %lli", new_size);2114 log("New size: %lli", new_size);
2115 start = (part->geom).start;2115 start = (part->geom).start;
2116 end = start + new_size / PED_SECTOR_SIZE_DEFAULT - 1;2116 end = start + new_size / dev->sector_size - 1;
2117 if (named_partition_is_virtual(device_name,2117 if (named_partition_is_virtual(device_name,
2118 part->geom.start, part->geom.end)) {2118 part->geom.start, part->geom.end)) {
2119 resize_partition(disk, part, start, end, false);2119 resize_partition(disk, part, start, end, false);
@@ -2124,8 +2124,8 @@
2124 }2124 }
2125 }2125 }
2126 oprintf("OK\n");2126 oprintf("OK\n");
2127 oprintf("%lli-%lli\n", (part->geom).start * PED_SECTOR_SIZE_DEFAULT,2127 oprintf("%lli-%lli\n", (part->geom).start * dev->sector_size,
2128 (part->geom).end * PED_SECTOR_SIZE_DEFAULT + PED_SECTOR_SIZE_DEFAULT - 1);2128 (part->geom).end * dev->sector_size + dev->sector_size - 1);
2129 free(id);2129 free(id);
2130}2130}
21312131
@@ -2153,17 +2153,17 @@
2153 critical_error("Expected new size");2153 critical_error("Expected new size");
2154 log("New size: %lli", new_size);2154 log("New size: %lli", new_size);
2155 start = (part->geom).start;2155 start = (part->geom).start;
2156 end = start + new_size / PED_SECTOR_SIZE_DEFAULT - 1;2156 end = start + new_size / dev->sector_size - 1;
2157 /* ensure that the size is not less than the requested */2157 /* ensure that the size is not less than the requested */
2158 do {2158 do {
2159 resize_partition(disk, part, start, end, false);2159 resize_partition(disk, part, start, end, false);
2160 end = end + 1;2160 end = end + 1;
2161 } while ((part->geom).length * PED_SECTOR_SIZE_DEFAULT < new_size);2161 } while ((part->geom).length * dev->sector_size < new_size);
2162 ped_disk_commit(disk);2162 ped_disk_commit(disk);
2163 unchange_named(device_name);2163 unchange_named(device_name);
2164 oprintf("OK\n");2164 oprintf("OK\n");
2165 oprintf("%lli-%lli\n", (part->geom).start * PED_SECTOR_SIZE_DEFAULT,2165 oprintf("%lli-%lli\n", (part->geom).start * dev->sector_size,
2166 (part->geom).end * PED_SECTOR_SIZE_DEFAULT + PED_SECTOR_SIZE_DEFAULT - 1);2166 (part->geom).end * dev->sector_size + dev->sector_size - 1);
2167 free(id);2167 free(id);
2168}2168}
21692169
@@ -2219,10 +2219,10 @@
2219 max_geom = ped_disk_get_max_partition_geometry(disk, part, constraint);2219 max_geom = ped_disk_get_max_partition_geometry(disk, part, constraint);
2220 if (part->type & PED_PARTITION_LOGICAL)2220 if (part->type & PED_PARTITION_LOGICAL)
2221 minimize_extended_partition(disk);2221 minimize_extended_partition(disk);
2222 min_size = constraint->min_size * PED_SECTOR_SIZE_DEFAULT;2222 min_size = constraint->min_size * dev->sector_size;
2223 current_size = (part->geom).length * PED_SECTOR_SIZE_DEFAULT;2223 current_size = (part->geom).length * dev->sector_size;
2224 if (max_geom)2224 if (max_geom)
2225 max_size = max_geom->length * PED_SECTOR_SIZE_DEFAULT;2225 max_size = max_geom->length * dev->sector_size;
2226 else2226 else
2227 max_size = current_size;2227 max_size = current_size;
2228 oprintf("OK\n");2228 oprintf("OK\n");
@@ -2263,10 +2263,10 @@
2263 max_geom = ped_disk_get_max_partition_geometry(disk, part, constraint);2263 max_geom = ped_disk_get_max_partition_geometry(disk, part, constraint);
2264 if (part->type & PED_PARTITION_LOGICAL)2264 if (part->type & PED_PARTITION_LOGICAL)
2265 minimize_extended_partition(disk);2265 minimize_extended_partition(disk);
2266 min_size = constraint->min_size * PED_SECTOR_SIZE_DEFAULT;2266 min_size = constraint->min_size * dev->sector_size;
2267 current_size = (part->geom).length * PED_SECTOR_SIZE_DEFAULT;2267 current_size = (part->geom).length * dev->sector_size;
2268 if (max_geom)2268 if (max_geom)
2269 max_size = max_geom->length * PED_SECTOR_SIZE_DEFAULT;2269 max_size = max_geom->length * dev->sector_size;
2270 else2270 else
2271 max_size = current_size;2271 max_size = current_size;
2272 oprintf("OK\n");2272 oprintf("OK\n");

Subscribers

People subscribed via source and target branches