Skip to content

Commit 8c805d1

Browse files
authored
Merge pull request #2650 from IsaacJT/increase-dd-block-size
storage: clone_device: increase dd block size
2 parents 27517fe + ed64dcf commit 8c805d1

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

kiwi/storage/clone_device.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ def clone(self, target_devices: List[DeviceProvider]):
5656
[
5757
'dd',
5858
'if={0}'.format(self.source_provider.get_device()),
59-
'of={0}'.format(target_device.get_device())
59+
'of={0}'.format(target_device.get_device()),
60+
'bs=1M'
6061
]
6162
)
6263
clone_id = BlockID(target_device.get_device())

test/unit/storage/clone_device_test.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def test_clone_filesystem(
3939
self.clone_device.clone([self.target_device])
4040

4141
mock_Command_run.assert_called_once_with(
42-
['dd', 'if=/dev/source-device', 'of=/dev/target-device']
42+
['dd', 'if=/dev/source-device', 'of=/dev/target-device', 'bs=1M']
4343
)
4444
mock_FileSystem_new.assert_called_once_with(
4545
'ext3', self.target_device
@@ -57,7 +57,10 @@ def test_clone_lvm(self, mock_BlockID, mock_Command_run):
5757

5858
assert mock_Command_run.call_args_list == [
5959
call(
60-
['dd', 'if=/dev/source-device', 'of=/dev/target-device']
60+
[
61+
'dd', 'if=/dev/source-device', 'of=/dev/target-device',
62+
'bs=1M'
63+
]
6164
),
6265
call(
6366
['vgimportclone', '/dev/target-device']
@@ -76,7 +79,10 @@ def test_clone_luks(self, mock_uuid4, mock_BlockID, mock_Command_run):
7679

7780
assert mock_Command_run.call_args_list == [
7881
call(
79-
['dd', 'if=/dev/source-device', 'of=/dev/target-device']
82+
[
83+
'dd', 'if=/dev/source-device', 'of=/dev/target-device',
84+
'bs=1M'
85+
]
8086
),
8187
call(
8288
[
@@ -114,7 +120,10 @@ def test_clone_raid(
114120
.return_value.set_uuid.assert_called_once_with()
115121
assert mock_Command_run.call_args_list == [
116122
call(
117-
['dd', 'if=/dev/source-device', 'of=/dev/target-device']
123+
[
124+
'dd', 'if=/dev/source-device', 'of=/dev/target-device',
125+
'bs=1M'
126+
]
118127
),
119128
call(
120129
['mdadm', '--stop', '/dev/md0']

0 commit comments

Comments
 (0)