proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-07-27 06:30:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Merge from Ubuntu:

Browse Source 
- source_grub2.py: Use attach_default_grub from apport's hookutils.
This commit is contained in:
Colin Watson 2013-01-29 05:38:34 +00:00
parent 21a37187f5
commit d48c35a473
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
debian/apport/source_grub2.py vendored
View File

@ -51,23 +51,12 @@ def check_shell_syntax_harder(path):
return False return False
return True return True
def _attach_file_filtered(report, path, key=None):
'''filter out password from grub configuration'''
if not key:
key = path_to_key(path)
if os.path.exists(path):
with open(path,'r') as f:
filtered = [l if not l.startswith('password')
else '### PASSWORD LINE REMOVED ###'
for l in f.readlines()]
report[key] = ''.join(filtered)
def add_info(report): def add_info(report):
if report['ProblemType'] == 'Package': if report['ProblemType'] == 'Package':
# To detect if root fs is a loop device # To detect if root fs is a loop device
attach_file(report, '/proc/cmdline','ProcCmdLine') attach_file(report, '/proc/cmdline','ProcCmdLine')
_attach_file_filtered(report, '/etc/default/grub','EtcDefaultGrub') attach_default_grub(report, 'EtcDefaultGrub')
attach_file_if_exists(report, '/boot/grub/device.map', 'DeviceMap') attach_file_if_exists(report, '/boot/grub/device.map', 'DeviceMap')
try: try:
grub_d = '/etc/default/grub.d' grub_d = '/etc/default/grub.d'

2
debian/changelog vendored
View File

@ -4,6 +4,8 @@ grub2 (2.00-13) UNRELEASED; urgency=low
- Fix booting FreeBSD >= 9.1 amd64 kernels (closes: #699002). - Fix booting FreeBSD >= 9.1 amd64 kernels (closes: #699002).
* Stop using the /usr/share/images/desktop-base/desktop-grub.png * Stop using the /usr/share/images/desktop-base/desktop-grub.png
alternative as the fallback background if GRUB_DISTRIBUTOR is "Ubuntu". alternative as the fallback background if GRUB_DISTRIBUTOR is "Ubuntu".
* Merge from Ubuntu:
- source_grub2.py: Use attach_default_grub from apport's hookutils.
-- Colin Watson <cjwatson@debian.org> Mon, 28 Jan 2013 11:08:07 +0000 -- Colin Watson <cjwatson@debian.org> Mon, 28 Jan 2013 11:08:07 +0000

2
debian/control vendored
View File

@ -76,7 +76,7 @@ Recommends: os-prober (>= 1.33)
Suggests: multiboot-doc, grub-emu, xorriso (>= 0.5.6.pl00), desktop-base (>= 4.0.6), console-setup Suggests: multiboot-doc, grub-emu, xorriso (>= 0.5.6.pl00), desktop-base (>= 4.0.6), console-setup
# See bugs #435983 and #455746 # See bugs #435983 and #455746
Conflicts: mdadm (<< 2.6.7-2) Conflicts: mdadm (<< 2.6.7-2)
Breaks: lupin-support (<< 0.30), friendly-recovery (<< 0.2.13) Breaks: lupin-support (<< 0.30), friendly-recovery (<< 0.2.13), apport (<< 2.1.1)
Multi-Arch: foreign Multi-Arch: foreign
Description: GRand Unified Bootloader (common files) Description: GRand Unified Bootloader (common files)
This package contains common files shared by the distinct flavours of GRUB. This package contains common files shared by the distinct flavours of GRUB.