summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2018-03-23 16:10:57 +0100
committerJonathan Bauer2018-03-23 16:10:57 +0100
commit71313a49506ecd0acf1e016593261949330082ce (patch)
treed67f9d6b3636a24d3daa0ba29db68a28f86146e0
parent[dnbd3-rootfs] support whitespace separated list (diff)
downloadsystemd-init-71313a49506ecd0acf1e016593261949330082ce.tar.gz
systemd-init-71313a49506ecd0acf1e016593261949330082ce.tar.xz
systemd-init-71313a49506ecd0acf1e016593261949330082ce.zip
Revert "[dnbd3-rfs] also check for PARTTYPE when lsblk'ing for disk partitions"
This reverts commit 9eb1dd0624854c92fe1174bb5e67e1b65e7390f5.
-rw-r--r--builder/modules.d/dnbd3-rootfs/scripts/tools.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/builder/modules.d/dnbd3-rootfs/scripts/tools.sh b/builder/modules.d/dnbd3-rootfs/scripts/tools.sh
index 4978260f..bace775e 100644
--- a/builder/modules.d/dnbd3-rootfs/scripts/tools.sh
+++ b/builder/modules.d/dnbd3-rootfs/scripts/tools.sh
@@ -64,7 +64,7 @@ tools_find_block_device() {
tools_find_block_device_simple() {
local device_info
lsblk --noheadings --list --paths --output \
- NAME,TYPE,LABEL,UUID,PARTTYPE,PARTLABEL,PARTUUID ${device:+"$device"} \
+ NAME,TYPE,LABEL,PARTLABEL,UUID,PARTUUID ${device:+"$device"} \
| sort --unique | while read -r device_info; do
local current_device
current_device=$(echo "$device_info" | cut -d' ' -f1)