Merge branch 'patch-1' into 'master'

Update rpi-resizerootfs See merge request raspi-team/image-specs!17
2020-07-05 14:35:15 +00:00 · 2020-07-05 14:35:15 +00:00 · 318ff053a9
parent 0cf508221f a6c0cc19ad
commit 318ff053a9
1 changed files with 2 additions and 4 deletions
--- a/6
+++ b/6
@ -1,9 +1,7 @@
 #!/bin/sh

-roottmp=$(lsblk -l -o NAME,MOUNTPOINT | grep '/$')
-rootpart=/dev/${roottmp%% */}
-rootdev=${rootpart%2}
-rootdev=${rootdev%p}
+rootpart="$(findmnt -n -o SOURCE /)"
+rootdev="/dev/$(lsblk -no pkname "$rootpart")"

 flock $rootdev sfdisk -f $rootdev -N 2 <<EOF
 ,+