diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/no-output-by-default.patch | 51 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 55 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 50df2f28..1969c7e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ shim (0.4-0ubuntu3) UNRELEASED; urgency=low * Install MokManager.efi.signed in the package. + * debian/patches/no-output-by-default.patch: Don't print any + informational messages. Closes LP: #1074302. - -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 03 Jul 2013 12:01:56 -0700 + -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 03 Jul 2013 12:02:12 -0700 shim (0.4-0ubuntu2) saucy; urgency=low diff --git a/debian/patches/no-output-by-default.patch b/debian/patches/no-output-by-default.patch new file mode 100644 index 00000000..52cda502 --- /dev/null +++ b/debian/patches/no-output-by-default.patch @@ -0,0 +1,51 @@ +Description: Don't print any informational messages + Unless the operation has failed, we shouldn't print anything at all while + booting. Suppress informational messages about the current SecureBoot + policy or how the image's signature was verified. +Author: Steve Langasek <steve.langasek@canonical.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1074302 + +Index: shim/shim.c +=================================================================== +--- shim.orig/shim.c ++++ shim/shim.c +@@ -430,7 +430,6 @@ + + /* FIXME - more paranoia here? */ + if (status != EFI_SUCCESS || sb != 1) { +- Print(L"Secure boot not enabled\n"); + return FALSE; + } + +@@ -438,7 +437,6 @@ + (void *)&setupmode); + + if (status == EFI_SUCCESS && setupmode == 1) { +- Print(L"Platform is in setup mode\n"); + return FALSE; + } + +@@ -698,7 +696,6 @@ + status = check_whitelist(cert, sha256hash, sha1hash); + + if (status == EFI_SUCCESS) { +- Print(L"Binary is whitelisted\n"); + return status; + } + +@@ -710,7 +707,6 @@ + shim_cert, sizeof(shim_cert), sha256hash, + SHA256_DIGEST_SIZE)) { + status = EFI_SUCCESS; +- Print(L"Binary is verified by the vendor certificate\n"); + return status; + } + +@@ -723,7 +719,6 @@ + vendor_cert, vendor_cert_size, sha256hash, + SHA256_DIGEST_SIZE)) { + status = EFI_SUCCESS; +- Print(L"Binary is verified by the vendor certificate\n"); + return status; + } + diff --git a/debian/patches/series b/debian/patches/series index 78756329..39007dbb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ prototypes second-stage-path sbsigntool-not-pesign +no-output-by-default.patch |