1
diff --git a/curtin/block/dasd.py b/curtin/block/dasd.py
2
index 9e5b43e..3423601 100644
3
--- a/curtin/block/dasd.py
4
+++ b/curtin/block/dasd.py
5
@@ -32,6 +32,57 @@ class DasdPartitionTable:
6
32
    def tracks_needed(self, size_in_bytes):
32
    def tracks_needed(self, size_in_bytes):
7
33
        return ((size_in_bytes - 1) // self.bytes_per_track) + 1
33
        return ((size_in_bytes - 1) // self.bytes_per_track) + 1
8
34
34
9
35
    def _ptable_for_new_partition(self, partnumber, partsize):
10
36
        if partnumber > 3:
11
37
            raise ValueError('DASD devices only allow 3 partitions')
12
38
13
39
        # first partition always starts at track 2
14
40
        # all others start after the previous partition ends
15
41
        if partnumber == 1:
16
42
            start = 2
17
43
        else:
18
44
            start = int(self.partitions[-1].end) + 1
19
45
        end = start + self.tracks_needed(partsize) - 1
20
46
21
47
        return [
22
48
            (p.start, p.end) for p in self.partitions[:partnumber-1]
23
49
            ] + [(start, end)]
24
50
25
51
    def add_partition(self, partnumber, partsize):
26
52
        """ Add a partition to this DasdDevice specifying partnumber and size.
27
53
28
54
        :param partnumber: integer value of partition number (1, 2 or 3)
29
55
        :param partsize: partition sizes in bytes.
30
56
31
57
        :raises: ValueError on invalid devname
32
58
33
59
        Example fdasd command with defaults:
34
60
          fdasd --verbose --config=/tmp/curtin/dasd-part1.fdasd /dev/dasdb
35
61
        """
36
62
        LOG.debug(
37
63
            "add_partition: partnumber: %s partsize: %s",
38
64
            partnumber, partsize)
39
65
40
66
        partitions = self._ptable_for_new_partition(partnumber, partsize)
41
67
        LOG.debug("fdasd: partitions to be created: %s", partitions)
42
68
        content = "\n".join([
43
69
            "[%s,%s]" % (part[0], part[1]) for part in partitions
44
70
            ])
45
71
        LOG.debug("fdasd: content=\n%s", content)
46
72
        wfp = tempfile.NamedTemporaryFile(suffix=".fdasd", delete=False)
47
73
        wfp.close()
48
74
        util.write_file(wfp.name, content)
49
75
        cmd = ['fdasd', '--verbose', '--config=%s' % wfp.name, self.devname]
50
76
        LOG.debug('Partitioning %s with %s', self.devname, cmd)
51
77
        try:
52
78
            out, err = util.subp(cmd, capture=True)
53
79
        except util.ProcessExecutionError as e:
54
80
            LOG.error("Partitioning failed: %s", e)
55
81
            raise
56
82
        finally:
57
83
            if os.path.exists(wfp.name):
58
84
                os.unlink(wfp.name)
59
85
60
35
    @classmethod
86
    @classmethod
61
36
    def from_fdasd_output(cls, devname, output):
87
    def from_fdasd_output(cls, devname, output):
62
37
        line_iter = iter(output.splitlines())
88
        line_iter = iter(output.splitlines())
63
@@ -226,59 +277,6 @@ class DasdDevice(CcwDevice):
64
226
    def devname(self):
277
    def devname(self):
65
227
        return '/dev/disk/by-path/ccw-%s' % self.device_id
278
        return '/dev/disk/by-path/ccw-%s' % self.device_id
66
228
279
67
229
    def partition(self, partnumber, partsize, strict=True):
68
230
        """ Add a partition to this DasdDevice specifying partnumber and size.
69
231
70
232
        :param partnumber: integer value of partition number (1, 2 or 3)
71
233
        :param partsize: partition sizes in bytes.
72
234
        :param strict: boolean which enforces that dasd device exists before
73
235
            issuing fdasd command, defaults to True.
74
236
75
237
        :raises: RuntimeError if strict==True and devname does not exist.
76
238
        :raises: ValueError on invalid devname
77
239
78
240
        Example fdasd command with defaults:
79
241
          fdasd --verbose --config=/tmp/curtin/dasd-part1.fdasd /dev/dasdb
80
242
        """
81
243
        if partnumber > 3:
82
244
            raise ValueError('DASD devices only allow 3 partitions')
83
245
84
246
        if strict and not os.path.exists(self.devname):
85
247
            raise RuntimeError("devname '%s' does not exist" % self.devname)
86
248
87
249
        pt = DasdPartitionTable.from_fdasd(self.devname)
88
250
        new_partitions = []
89
251
        for partinfo in pt.partitions[0:partnumber]:
90
252
            new_partitions.append((partinfo.start, partinfo.end))
91
253
92
254
        # first partition always starts at track 2
93
255
        # all others start after the previous partition ends
94
256
        if partnumber == 1:
95
257
            start = 2
96
258
        else:
97
259
            start = int(pt.partitions[-1].end) + 1
98
260
        # end is inclusive
99
261
        end = start + pt.tracks_needed(partsize) - 1
100
262
        new_partitions.append((start, end))
101
263
102
264
        content = "\n".join(["[%s,%s]" % (part[0], part[1])
103
265
                             for part in new_partitions])
104
266
        LOG.debug("fdasd: partitions to be created: %s", new_partitions)
105
267
        LOG.debug("fdasd: content=\n%s", content)
106
268
        wfp = tempfile.NamedTemporaryFile(suffix=".fdasd", delete=False)
107
269
        wfp.close()
108
270
        util.write_file(wfp.name, content)
109
271
        cmd = ['fdasd', '--verbose', '--config=%s' % wfp.name, self.devname]
110
272
        LOG.debug('Partitioning %s with %s', self.devname, cmd)
111
273
        try:
112
274
            out, err = util.subp(cmd, capture=True)
113
275
        except util.ProcessExecutionError as e:
114
276
            LOG.error("Partitioning failed: %s", e)
115
277
            raise
116
278
        finally:
117
279
            if os.path.exists(wfp.name):
118
280
                os.unlink(wfp.name)
119
281
120
282
    def is_not_formatted(self):
280
    def is_not_formatted(self):
121
283
        """ Returns a boolean indicating if the specified device_id is not yet
281
        """ Returns a boolean indicating if the specified device_id is not yet
122
284
            formatted.
282
            formatted.
123
diff --git a/curtin/commands/block_meta.py b/curtin/commands/block_meta.py
124
index 66dfdb4..e29c1e4 100644
125
--- a/curtin/commands/block_meta.py
126
+++ b/curtin/commands/block_meta.py
127
@@ -946,9 +946,8 @@ def partition_handler(info, storage_config):
128
946
                   "--typecode=%s:%s" % (partnumber, typecode), disk]
946
                   "--typecode=%s:%s" % (partnumber, typecode), disk]
129
947
            util.subp(cmd, capture=True)
947
            util.subp(cmd, capture=True)
130
948
        elif disk_ptable == "vtoc":
948
        elif disk_ptable == "vtoc":
134
949
            disk_device_id = storage_config.get(device).get('device_id')
949
            dasd_pt = dasd.DasdPartitionTable.from_fdasd(disk)
135
950
            dasd_device = dasd.DasdDevice(disk_device_id)
950
            dasd_pt.add_partition(partnumber, length_bytes)
133
951
            dasd_device.partition(partnumber, length_bytes)
136
952
        else:
951
        else:
137
953
            raise ValueError("parent partition has invalid partition table")
952
            raise ValueError("parent partition has invalid partition table")
138
954
953
Status:	Merged
Approved by:	Michael Hudson-Doyle on 2020-12-14
Approved revision:	aa3b5848467933c8b14dab6899360d83ff28a45c
Merge reported by:	Server Team CI bot
Merged at revision:	not available
Proposed branch:	~mwhudson/curtin:partition-dasd-without-device_id
Merge into:	curtin:master
Diff against target:	137 lines (+53/-56) 2 files modified curtin/block/dasd.py (+51/-53) curtin/commands/block_meta.py (+2/-3)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Server Team CI bot	continuous-integration	2020-12-14	Approve on 2020-12-14
Paride Legovini		2020-12-14	Pending
Review via email: mp+395330@code.launchpad.net