1
1
package testdisk
2
2
3
3
import (
4
- "github.com/osbuild/images/internal/common "
4
+ "github.com/osbuild/images/pkg/datasizes "
5
5
"github.com/osbuild/images/pkg/disk"
6
6
)
7
7
8
- const FakePartitionSize = uint64 (789 ) * common .MiB
8
+ const FakePartitionSize = uint64 (789 ) * datasizes .MiB
9
9
10
10
// MakeFakePartitionTable is a helper to create partition table structs
11
11
// for tests. It uses sensible defaults for common scenarios.
@@ -43,7 +43,7 @@ func MakeFakeBtrfsPartitionTable(mntPoints ...string) *disk.PartitionTable {
43
43
var subvolumes []disk.BtrfsSubvolume
44
44
pt := & disk.PartitionTable {
45
45
Type : "gpt" ,
46
- Size : 10 * common .GiB ,
46
+ Size : 10 * datasizes .GiB ,
47
47
Partitions : []disk.Partition {},
48
48
}
49
49
size := uint64 (0 )
@@ -52,24 +52,24 @@ func MakeFakeBtrfsPartitionTable(mntPoints ...string) *disk.PartitionTable {
52
52
case "/boot" :
53
53
pt .Partitions = append (pt .Partitions , disk.Partition {
54
54
Start : size ,
55
- Size : 1 * common .GiB ,
55
+ Size : 1 * datasizes .GiB ,
56
56
Payload : & disk.Filesystem {
57
57
Type : "ext4" ,
58
58
Mountpoint : mntPoint ,
59
59
},
60
60
})
61
- size += 1 * common .GiB
61
+ size += 1 * datasizes .GiB
62
62
case "/boot/efi" :
63
63
pt .Partitions = append (pt .Partitions , disk.Partition {
64
64
Start : size ,
65
- Size : 100 * common .MiB ,
65
+ Size : 100 * datasizes .MiB ,
66
66
Payload : & disk.Filesystem {
67
67
Type : "vfat" ,
68
68
Mountpoint : mntPoint ,
69
69
UUID : disk .EFIFilesystemUUID ,
70
70
},
71
71
})
72
- size += 100 * common .MiB
72
+ size += 100 * datasizes .MiB
73
73
default :
74
74
name := mntPoint
75
75
if name == "/" {
@@ -89,14 +89,14 @@ func MakeFakeBtrfsPartitionTable(mntPoints ...string) *disk.PartitionTable {
89
89
90
90
pt .Partitions = append (pt .Partitions , disk.Partition {
91
91
Start : size ,
92
- Size : 9 * common .GiB ,
92
+ Size : 9 * datasizes .GiB ,
93
93
Payload : & disk.Btrfs {
94
94
UUID : disk .RootPartitionUUID ,
95
95
Subvolumes : subvolumes ,
96
96
},
97
97
})
98
98
99
- size += 9 * common .GiB
99
+ size += 9 * datasizes .GiB
100
100
pt .Size = size
101
101
102
102
return pt
@@ -108,7 +108,7 @@ func MakeFakeLVMPartitionTable(mntPoints ...string) *disk.PartitionTable {
108
108
var lvs []disk.LVMLogicalVolume
109
109
pt := & disk.PartitionTable {
110
110
Type : "gpt" ,
111
- Size : 10 * common .GiB ,
111
+ Size : 10 * datasizes .GiB ,
112
112
Partitions : []disk.Partition {},
113
113
}
114
114
size := uint64 (0 )
@@ -117,24 +117,24 @@ func MakeFakeLVMPartitionTable(mntPoints ...string) *disk.PartitionTable {
117
117
case "/boot" :
118
118
pt .Partitions = append (pt .Partitions , disk.Partition {
119
119
Start : size ,
120
- Size : 1 * common .GiB ,
120
+ Size : 1 * datasizes .GiB ,
121
121
Payload : & disk.Filesystem {
122
122
Type : "ext4" ,
123
123
Mountpoint : mntPoint ,
124
124
},
125
125
})
126
- size += 1 * common .GiB
126
+ size += 1 * datasizes .GiB
127
127
case "/boot/efi" :
128
128
pt .Partitions = append (pt .Partitions , disk.Partition {
129
129
Start : size ,
130
- Size : 100 * common .MiB ,
130
+ Size : 100 * datasizes .MiB ,
131
131
Payload : & disk.Filesystem {
132
132
Type : "vfat" ,
133
133
Mountpoint : mntPoint ,
134
134
UUID : disk .EFIFilesystemUUID ,
135
135
},
136
136
})
137
- size += 100 * common .MiB
137
+ size += 100 * datasizes .MiB
138
138
default :
139
139
name := "lv-for-" + mntPoint
140
140
if name == "/" {
@@ -155,13 +155,13 @@ func MakeFakeLVMPartitionTable(mntPoints ...string) *disk.PartitionTable {
155
155
156
156
pt .Partitions = append (pt .Partitions , disk.Partition {
157
157
Start : size ,
158
- Size : 9 * common .GiB ,
158
+ Size : 9 * datasizes .GiB ,
159
159
Payload : & disk.LVMVolumeGroup {
160
160
LogicalVolumes : lvs ,
161
161
},
162
162
})
163
163
164
- size += 9 * common .GiB
164
+ size += 9 * datasizes .GiB
165
165
pt .Size = size
166
166
167
167
return pt
0 commit comments