diff options
author | Andrew Cady <d@jerkface.net> | 2021-02-25 16:47:20 -0500 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2021-02-25 16:49:08 -0500 |
commit | 126f4c5cc01ae8ea5a9c3cc63e207826381d7738 (patch) | |
tree | d0066d93802ef5d1d88a40352f53914708e6614f /src/partvi | |
parent | 571f14acc0045f15a69e44557bff601d270726a9 (diff) |
partvi: clarify code
Diffstat (limited to 'src/partvi')
-rwxr-xr-x | src/partvi | 29 |
1 files changed, 12 insertions, 17 deletions
@@ -166,15 +166,19 @@ iterate_partitions() | |||
166 | 166 | ||
167 | require_var type | 167 | require_var type |
168 | case "$type" in | 168 | case "$type" in |
169 | efi-system-partition|bios-grub|boot|samizdat-*) ;; | 169 | dm-verity-hashes|dm-verity-data) |
170 | dm-verity-hashes|dm-verity-data) require_var data_path ;; | 170 | require_var data_path |
171 | partition-table) ;; | 171 | [ ! "$SKIP_ROOTFS_COPY" ] || continue |
172 | ;; | ||
173 | efi-system-partition|bios-grub|boot|samizdat-*|partition-table) ;; | ||
172 | *) die "invalid type: $type" ;; | 174 | *) die "invalid type: $type" ;; |
173 | esac | 175 | esac |
174 | 176 | ||
175 | imgfile=$builddir/$img | 177 | case "$type" in |
178 | dm-verity-data|dm-verity-hashes) | ||
179 | esac | ||
176 | 180 | ||
177 | check_for_key_only_skip || continue | 181 | imgfile=$builddir/$img |
178 | "$@" || return | 182 | "$@" || return |
179 | done | 183 | done |
180 | } | 184 | } |
@@ -266,15 +270,6 @@ pee_on_table() | |||
266 | loudly $sudo sfdisk --no-tell-kernel -Y dos "$dev" < "$DOS_TABLE_FILE" || return | 270 | loudly $sudo sfdisk --no-tell-kernel -Y dos "$dev" < "$DOS_TABLE_FILE" || return |
267 | } | 271 | } |
268 | 272 | ||
269 | check_for_key_only_skip() | ||
270 | { | ||
271 | [ "$KEY_ONLY" ] || return 0 | ||
272 | case "$type" in | ||
273 | dm-verity-data|dm-verity-hashes) false ;; | ||
274 | *) true ;; | ||
275 | esac | ||
276 | } | ||
277 | |||
278 | clone_parts_to_target() | 273 | clone_parts_to_target() |
279 | { | 274 | { |
280 | 275 | ||
@@ -300,10 +295,10 @@ cleanup() | |||
300 | fi | 295 | fi |
301 | } | 296 | } |
302 | 297 | ||
303 | KEY_ONLY= | 298 | SKIP_ROOTFS_COPY= |
304 | if [ "$1" = 'key' ] | 299 | if [ "$1" = 'key' ] |
305 | then | 300 | then |
306 | KEY_ONLY=y | 301 | SKIP_ROOTFS_COPY=y |
307 | fi | 302 | fi |
308 | 303 | ||
309 | set -e | 304 | set -e |
@@ -316,7 +311,7 @@ then sudo= | |||
316 | else sudo=sudo | 311 | else sudo=sudo |
317 | fi | 312 | fi |
318 | 313 | ||
319 | if [ "$KEY_ONLY" ] | 314 | if [ "$SKIP_ROOTFS_COPY" ] |
320 | then | 315 | then |
321 | target=key.img | 316 | target=key.img |
322 | else | 317 | else |