proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-10-24 14:31:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix an uninitialized variable warning.

Browse Source
This commit is contained in:
Colin Watson 2014-01-28 23:50:30 +00:00
commit 13e13517d1
29 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/.git-dpm vendored
View File

@ -1,6 +1,6 @@
# see git-dpm(1) from git-dpm package
f6e6d59bfa40b7bacfb99446f8b432dca83b7692
f6e6d59bfa40b7bacfb99446f8b432dca83b7692
747496a6d37d07538649a8045325a448dd77a3c4
747496a6d37d07538649a8045325a448dd77a3c4
e8f07821cce1bd0ab6d5622c2a42440f15f4fd71
e8f07821cce1bd0ab6d5622c2a42440f15f4fd71
grub2_2.02~beta2.orig.tar.xz

2
debian/patches/blacklist_1440x900x32.patch vendored
View File

@ -1,4 +1,4 @@
From 8b1331cfab8c2c88ff2ecb83d082767006048ea4 Mon Sep 17 00:00:00 2001
From 4b0f317bcce4f33447c75c97bf5b5c26abfb1525 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 13 Jan 2014 12:13:11 +0000
Subject: Blacklist 1440x900x32 from VBE preferred mode handling

15
debian/patches/default_grub_d.patch vendored
View File

@ -1,4 +1,4 @@
From 456b43187661cb81c2e7022f7ed8b010d85064d5 Mon Sep 17 00:00:00 2001
From b7b657b655fb49c41eaa51293aa54097a5dbdfa5 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 13 Jan 2014 12:13:10 +0000
Subject: Read /etc/default/grub.d/*.cfg after /etc/default/grub
@ -9,12 +9,12 @@ Last-Update: 2014-01-28
Patch-Name: default_grub_d.patch
---
grub-core/osdep/unix/config.c | 112 ++++++++++++++++++++++++++++++++++--------
grub-core/osdep/unix/config.c | 114 ++++++++++++++++++++++++++++++++++--------
util/grub-mkconfig.in | 5 ++
2 files changed, 97 insertions(+), 20 deletions(-)
2 files changed, 98 insertions(+), 21 deletions(-)
diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c
index f4b0bb4..7b7fdc6 100644
index f4b0bb4..95eabc8 100644
--- a/grub-core/osdep/unix/config.c
+++ b/grub-core/osdep/unix/config.c
@@ -24,6 +24,8 @@
@ -26,7 +26,7 @@ index f4b0bb4..7b7fdc6 100644
#include <string.h>
#include <sys/types.h>
#include <sys/wait.h>
@@ -61,6 +63,13 @@ grub_util_get_localedir (void)
@@ -61,13 +63,27 @@ grub_util_get_localedir (void)
return LOCALEDIR;
}
@ -40,9 +40,10 @@ index f4b0bb4..7b7fdc6 100644
void
grub_util_load_config (struct grub_util_config *cfg)
{
@@ -68,6 +77,13 @@ grub_util_load_config (struct grub_util_config *cfg)
pid_t pid;
const char *argv[4];
char *script, *ptr;
- char *script, *ptr;
+ char *script = NULL, *ptr;
const char *cfgfile, *iptr;
+ char *cfgdir;
+ grub_util_fd_dir_t d;

2
debian/patches/elf_bi_endian.patch vendored
View File

@ -1,4 +1,4 @@
From 8f735bcf5acd775e7a35a072dd8e6049eb62a8c5 Mon Sep 17 00:00:00 2001
From 4a42ac8d567ce0a74687f2da6afb9e88f6d4099d Mon Sep 17 00:00:00 2001
From: Tomohiro B Berry <tbberry@us.ibm.com>
Date: Tue, 14 Jan 2014 17:43:25 +0000
Subject: Add bi-endian support to ELF parser

2
debian/patches/freebsd_debugflags_eperm.patch vendored
View File

@ -1,4 +1,4 @@
From deb30ba6d7b01de7a6ac898596f47505eab40720 Mon Sep 17 00:00:00 2001
From d745c136fb0d268d843236c810a8c5b5b0dd4048 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Fri, 17 Jan 2014 02:55:58 +0000
Subject: Ignore EPERM when modifying kern.geom.debugflags

2
debian/patches/gfxpayload_dynamic.patch vendored
View File

@ -1,4 +1,4 @@
From 8575a84fe17f8278b9206015af1f66c15c2cba74 Mon Sep 17 00:00:00 2001
From bda2afd2546d6fb505afdd6406a668e6fc9a735e Mon Sep 17 00:00:00 2001
From: Evan Broder <evan@ebroder.net>
Date: Mon, 13 Jan 2014 12:13:29 +0000
Subject: Add configure option to enable gfxpayload=keep dynamically

2
debian/patches/grub-shell-no-pad.patch vendored
View File

@ -1,4 +1,4 @@
From 7354e71090201e34d682530f858e3972fe7d3099 Mon Sep 17 00:00:00 2001
From fc98be5f4e09d5960d55ebd2b6e22f301cd83987 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Thu, 16 Jan 2014 12:51:23 +0000
Subject: grub-shell: Pass -no-pad to xorriso when building floppy images

2
debian/patches/ignore_grub_func_test_failures.patch vendored
View File

@ -1,4 +1,4 @@
From e9db6823d7a5de73fe80f742e9813ca33a286dfd Mon Sep 17 00:00:00 2001
From 42364ad963f4b1ea010c5cf05b1bb8b9bdcc546e Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Mon, 13 Jan 2014 12:13:32 +0000
Subject: Ignore functional test failures for now as they are broken

2
debian/patches/install_efi_ubuntu_flavours.patch vendored
View File

@ -1,4 +1,4 @@
From cf637cd4ebc2d1da31eda10de73bbd2c4cee68ae Mon Sep 17 00:00:00 2001
From 4d7a5b913e148b9086ab89d62c98e50ca66d6c9b Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 13 Jan 2014 12:13:27 +0000
Subject: Cope with Kubuntu setting GRUB_DISTRIBUTOR

2
debian/patches/install_powerpc_machtypes.patch vendored
View File

@ -1,4 +1,4 @@
From f6e6d59bfa40b7bacfb99446f8b432dca83b7692 Mon Sep 17 00:00:00 2001
From 747496a6d37d07538649a8045325a448dd77a3c4 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Tue, 28 Jan 2014 14:40:02 +0000
Subject: Port yaboot logic for various powerpc machine types

2
debian/patches/install_signed.patch vendored
View File

@ -1,4 +1,4 @@
From b7e82b5eaaada3f85430ea5832f23a9c0f58a19f Mon Sep 17 00:00:00 2001
From af2df8281cbf3bcc7db1246551008bb0bbae007b Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 13 Jan 2014 12:13:22 +0000
Subject: Install signed images if UEFI Secure Boot is enabled

2
debian/patches/linuxefi.patch vendored
View File

@ -1,4 +1,4 @@
From d39f1a7e3dd33a2f3ce596350591075a71a9425e Mon Sep 17 00:00:00 2001
From 2359f527c5091fb6633eec1b165db05c07eb83cf Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg@redhat.com>
Date: Mon, 13 Jan 2014 12:13:15 +0000
Subject: Add "linuxefi" loader which avoids ExitBootServices

2
debian/patches/linuxefi_amd64_only.patch vendored
View File

@ -1,4 +1,4 @@
From a16e48a24310eac5fadb2183deda89a1b00ff32e Mon Sep 17 00:00:00 2001
From d17d82d5217170e5f3124ed1c5aa77a7b8f253d7 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 13 Jan 2014 12:13:16 +0000
Subject: Only build linuxefi on amd64

2
debian/patches/linuxefi_debug.patch vendored
View File

@ -1,4 +1,4 @@
From efd9ff3eff1d48c498592bf61bc90b47d8c490f5 Mon Sep 17 00:00:00 2001
From 935cb0d861b3e0a0ab9340f7f1527fa1d0d388af Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 13 Jan 2014 12:13:18 +0000
Subject: Add more debugging to linuxefi

2
debian/patches/linuxefi_non_sb_fallback.patch vendored
View File

@ -1,4 +1,4 @@
From 1e58c5e035f2324f273664720458de48f2014a5f Mon Sep 17 00:00:00 2001
From 34d4893c33d118806ebde0a0efbc6c2cd1687dcc Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 13 Jan 2014 12:13:20 +0000
Subject: If running under UEFI secure boot, attempt to use linuxefi loader

2
debian/patches/linuxefi_require_shim.patch vendored
View File

@ -1,4 +1,4 @@
From ceea76bad9989e0ba4629e9e0d05a918066993de Mon Sep 17 00:00:00 2001
From 22fb5cb563a439aab34fd9b4ce33e10ee54c03e1 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 13 Jan 2014 12:13:19 +0000
Subject: Make linuxefi refuse to boot without shim

2
debian/patches/macbless_mansection.patch vendored
View File

@ -1,4 +1,4 @@
From 018d839eb3b3710d022713c422fdb34a3578f0d8 Mon Sep 17 00:00:00 2001
From 4c565aaad13c96c1b3525cbdc836892a2b3eabc1 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 8 Jan 2014 11:05:20 +0000
Subject: * Makefile.util.def (grub-macbless): Change mansection to 8.

2
debian/patches/maybe_quiet.patch vendored
View File

@ -1,4 +1,4 @@
From 3f5c6ce2b682a5e104fca25efcd5dc8e31b864bf Mon Sep 17 00:00:00 2001
From a22ef2bbf3232bc9b1982fc9fee92a7f56b5cd7c Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 13 Jan 2014 12:13:26 +0000
Subject: Add configure option to reduce visual clutter at boot time

2
debian/patches/mkconfig_recovery_title.patch vendored
View File

@ -1,4 +1,4 @@
From b57e48a75c3142efe9b7ec47e0f0a71f606fa2d9 Mon Sep 17 00:00:00 2001
From c3c70fbb049ae45de7d72800d41c97fabbba09ae Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 13 Jan 2014 12:13:33 +0000
Subject: Add GRUB_RECOVERY_TITLE option

2
debian/patches/mkconfig_signed_kernel.patch vendored
View File

@ -1,4 +1,4 @@
From ae10dec295676230fbc886a5e260afb616433939 Mon Sep 17 00:00:00 2001
From d17e028ba932b3583e36074e62fa1a1bf1b24bd1 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 13 Jan 2014 12:13:21 +0000
Subject: Generate configuration for signed UEFI kernels if available

2
debian/patches/mkconfig_ubuntu_distributor.patch vendored
View File

@ -1,4 +1,4 @@
From a5f2eff241350d805dd5e0085690b475bb66455b Mon Sep 17 00:00:00 2001
From 9b945075b6407e9cd862cee51eb244cb5f6ead80 Mon Sep 17 00:00:00 2001
From: Mario Limonciello <Mario_Limonciello@dell.com>
Date: Mon, 13 Jan 2014 12:13:14 +0000
Subject: Remove GNU/Linux from default distributor string for Ubuntu

2
debian/patches/probe_fusionio.patch vendored
View File

@ -1,4 +1,4 @@
From ffd4a6e24200858ed49b92b650493e8c59b47a21 Mon Sep 17 00:00:00 2001
From 9301628f624589fcac74f61c0711ce950a362528 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 13 Jan 2014 12:13:31 +0000
Subject: Probe FusionIO devices

2
debian/patches/quick_boot.patch vendored
View File

@ -1,4 +1,4 @@
From d7b9e7f5dfbeba56b7c515850e816a1f5d2af192 Mon Sep 17 00:00:00 2001
From 1470162d206cd88869bc29bb4b88e449447ef347 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 13 Jan 2014 12:13:28 +0000
Subject: Add configure option to bypass boot menu if possible

2
debian/patches/skip_gettext_strings_test.patch vendored
View File

@ -1,4 +1,4 @@
From 9c99482624633e4bc8a49cc83222a9652e5176ac Mon Sep 17 00:00:00 2001
From 970690081f88e5b0c99ba3be43441c470abb08c1 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 13 Jan 2014 12:13:34 +0000
Subject: Don't run gettext_strings_test

2
debian/patches/sleep_shift.patch vendored
View File

@ -1,4 +1,4 @@
From 7da1b970bf91a16642f1fa48481c9da5d480859b Mon Sep 17 00:00:00 2001
From 9eea9d9c11448edd7d234c31196fdcece1737541 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 13 Jan 2014 12:13:23 +0000
Subject: Allow Shift to interrupt 'sleep --interruptible'

2
debian/patches/uefi_firmware_setup.patch vendored
View File

@ -1,4 +1,4 @@
From 6edbc585519e8643ad7cb810b5cbad643345da0f Mon Sep 17 00:00:00 2001
From 1f7a967fdb2402b74258d7675f92ba5f99a05e7c Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@ubuntu.com>
Date: Mon, 13 Jan 2014 12:13:12 +0000
Subject: Output a menu entry for firmware setup on UEFI FastBoot systems

2
debian/patches/vt_handoff.patch vendored
View File

@ -1,4 +1,4 @@
From 868ae32e5e817fcc5b2a75fc12e66ff40ca71475 Mon Sep 17 00:00:00 2001
From a8442bb12d61e5439ce33dc487a6700bf3380139 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 13 Jan 2014 12:13:30 +0000
Subject: Add configure option to use vt.handoff=7

2
debian/patches/wubi_no_windows.patch vendored
View File

@ -1,4 +1,4 @@
From e08f779f2ef39466cc259def8bd19c910e785d4c Mon Sep 17 00:00:00 2001
From 20c2d356f5176ae7b7f74a546e8742d89289d76c Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 13 Jan 2014 12:13:24 +0000
Subject: Skip Windows os-prober entries on Wubi systems

2
grub-core/osdep/unix/config.c
View File

@ -75,7 +75,7 @@ grub_util_load_config (struct grub_util_config *cfg)
{
pid_t pid;
const char *argv[4];
char *script, *ptr;
char *script = NULL, *ptr;
const char *cfgfile, *iptr;
char *cfgdir;
grub_util_fd_dir_t d;