diff options
| author | Steve McIntyre <steve@einval.com> | 2023-02-23 22:43:04 +0000 |
|---|---|---|
| committer | Steve McIntyre <steve@einval.com> | 2023-02-23 22:50:36 +0000 |
| commit | 3d8d2c2219f82999e4c2f918f3ead16750ce4445 (patch) | |
| tree | 56769d30015c9e2785160be0c5b2be8a6141882c | |
| parent | f819cbfdb473ce2fd4afd2d897c637dddedd9022 (diff) | |
| download | shim-signed-3d8d2c2219f82999e4c2f918f3ead16750ce4445.tar.gz shim-signed-3d8d2c2219f82999e4c2f918f3ead16750ce4445.zip | |
postinst/postrm: make config_item() more robust
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | debian/shim-signed.postinst | 4 | ||||
| -rwxr-xr-x | debian/shim-signed.postrm | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 251c021..6d04776 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,8 +11,9 @@ shim-signed (1.39) UNRELEASED; urgency=medium * Update build-dep on shim-unsigned to use 15.7-1 * Block Debian grub binaries with sbat < 4 (see #1024617) + Update Depends on grub2-common to match. + * postinst/postrm: make config_item() more robust - -- Steve McIntyre <93sam@debian.org> Fri, 17 Feb 2023 13:21:24 +0000 + -- Steve McIntyre <93sam@debian.org> Thu, 23 Feb 2023 22:27:32 +0000 shim-signed (1.38) unstable; urgency=medium diff --git a/debian/shim-signed.postinst b/debian/shim-signed.postinst index 1ddd00a..d459f3a 100755 --- a/debian/shim-signed.postinst +++ b/debian/shim-signed.postinst @@ -41,7 +41,9 @@ config_item () . /etc/default/grub || return for x in /etc/default/grub.d/*.cfg; do if [ -e "$x" ]; then - . "$x" + # Lose any output here so we don't confuse our + # caller. The xen packages echo stuff here, Aargh! + . "$x" > /dev/null fi done fi diff --git a/debian/shim-signed.postrm b/debian/shim-signed.postrm index 9db2640..234ad39 100755 --- a/debian/shim-signed.postrm +++ b/debian/shim-signed.postrm @@ -44,7 +44,9 @@ config_item () . /etc/default/grub || return for x in /etc/default/grub.d/*.cfg; do if [ -e "$x" ]; then - . "$x" + # Lose any output here so we don't confuse our + # caller. The xen packages echo stuff here, Aargh! + . "$x" > /dev/null fi done fi |