Merge ~oddbloke/update-notifier:oddbloke/nbd-focal into update-notifier:focal

Proposed by Dan Watkins
Status: Needs review
Proposed branch: ~oddbloke/update-notifier:oddbloke/nbd-focal
Merge into: update-notifier:focal
Diff against target: 13 lines (+1/-1)
1 file modified
data/update-motd-fsck-at-reboot (+1/-1)
Reviewer Review Type Date Requested Status
Dan Bungert Approve
Review via email: mp+427498@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dan Bungert (dbungert) wrote :

Sadly, this causes autopkgtest failures on update-motd if run on a system with no ext partitions.
LP: #1987703

review: Disapprove
c6b1e86... by Dan Watkins

update-motd-fsck-at-reboot: don't error on non-ext systems

LP: #1987703

Revision history for this message
Dan Watkins (oddbloke) wrote :

Pushed up the fix!

Revision history for this message
Dan Bungert (dbungert) wrote :

LGTM

review: Approve

Unmerged commits

c6b1e86... by Dan Watkins

update-motd-fsck-at-reboot: don't error on non-ext systems

LP: #1987703

4aadaa9... by Dan Watkins

update-motd-fsck-at-reboot: exclude /dev/nbd*

Absent extraordinary user configuration, NBD devices will not be present
to fsck on the next reboot and so should be excluded from this
messaging. (This also avoids hanging reboots when NBD devices are no
longer responding.)

LP: #1982486

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/data/update-motd-fsck-at-reboot b/data/update-motd-fsck-at-reboot
2index 0335f3a..c027236 100755
3--- a/data/update-motd-fsck-at-reboot
4+++ b/data/update-motd-fsck-at-reboot
5@@ -38,7 +38,7 @@ if [ -n "$NEEDS_FSCK_CHECK" ]; then
6 {
7 check_occur_any=
8
9- ext_partitions=$(mount | awk '$5 ~ /^ext(2|3|4)$/ { print $1 }')
10+ ext_partitions=$(mount | awk '$5 ~ /^ext(2|3|4)$/ { print $1 }' | grep -v "/dev/nbd" || true)
11 for part in $ext_partitions; do
12 dumpe2fs_out=$(dumpe2fs -h $part 2>/dev/null)
13 mount_count=$(echo "$dumpe2fs_out" | grep "^Mount count:"|cut -d':' -f 2-)

Subscribers

People subscribed via source and target branches