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

Proposed by Dan Watkins
Status: Merged
Merged at revision: f362b2c89160506c0d272425b3cf949bbf510168
Proposed branch: ~oddbloke/update-notifier:oddbloke/nbd
Merge into: update-notifier:master
Diff against target: 28 lines (+8/-1)
2 files modified
data/update-motd-fsck-at-reboot (+1/-1)
debian/changelog (+7/-0)
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+427497@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/data/update-motd-fsck-at-reboot b/data/update-motd-fsck-at-reboot
index 0335f3a..ce608ce 100755
--- a/data/update-motd-fsck-at-reboot
+++ b/data/update-motd-fsck-at-reboot
@@ -38,7 +38,7 @@ if [ -n "$NEEDS_FSCK_CHECK" ]; then
38 {38 {
39 check_occur_any=39 check_occur_any=
4040
41 ext_partitions=$(mount | awk '$5 ~ /^ext(2|3|4)$/ { print $1 }')41 ext_partitions=$(mount | awk '$5 ~ /^ext(2|3|4)$/ { print $1 }' | grep -v "/dev/nbd")
42 for part in $ext_partitions; do42 for part in $ext_partitions; do
43 dumpe2fs_out=$(dumpe2fs -h $part 2>/dev/null)43 dumpe2fs_out=$(dumpe2fs -h $part 2>/dev/null)
44 mount_count=$(echo "$dumpe2fs_out" | grep "^Mount count:"|cut -d':' -f 2-)44 mount_count=$(echo "$dumpe2fs_out" | grep "^Mount count:"|cut -d':' -f 2-)
diff --git a/debian/changelog b/debian/changelog
index 5e6df89..b781412 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1update-notifier (3.192.55) UNRELEASED; urgency=medium
2
3 * data/update-motd-fsck-at-reboot: exclude NBD devices from reporting
4 (LP: #1982486)
5
6 -- Daniel Watkins <oddbloke@ubuntu.com> Wed, 27 Jul 2022 10:29:27 -0400
7
1update-notifier (3.192.54) jammy; urgency=medium8update-notifier (3.192.54) jammy; urgency=medium
29
3 * d/95-hwe-eol: do not update eol data more than once per day (LP: #1893716)10 * d/95-hwe-eol: do not update eol data more than once per day (LP: #1893716)

Subscribers

People subscribed via source and target branches