proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-10-25 19:39:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

debian/postinst.in, debian/kernel/zz-update-grub: Call systemd-detect-virt (which works under any init system, despite the name) instead of the Ubuntu specific running-in-container wrapper. (LP: #1539016)

Browse Source
This commit is contained in:
Martin Pitt 2016-01-28 14:10:58 +00:00 committed by Colin Watson
parent a129b76e60
commit 74aee3f1fe
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,7 +1,14 @@
grub2 (2.02~beta2-36) UNRELEASED; urgency=medium
[ Colin Watson ]
* Use HTTPS for Vcs-Git URL.
[ Martin Pitt ]
* debian/postinst.in, debian/kernel/zz-update-grub: Call
systemd-detect-virt (which works under any init system, despite the
name) instead of the Ubuntu specific running-in-container wrapper.
(LP: #1539016)
-- Colin Watson <cjwatson@debian.org> Wed, 27 Jan 2016 11:51:12 +0000
grub2 (2.02~beta2-35) unstable; urgency=medium

4
debian/kernel/zz-update-grub vendored
View File

@ -3,8 +3,8 @@ set -e
which update-grub >/dev/null 2>&1 || exit 0
if type running-in-container >/dev/null 2>&1 && \
running-in-container >/dev/null; then
if type systemd-detect-virt >/dev/null 2>&1 &&
systemd-detect-virt --quiet --container; then
exit 0
fi

2
debian/postinst.in vendored
View File

@ -296,7 +296,7 @@ config_item()
running_in_container()
{
type running-in-container >/dev/null 2>&1 && running-in-container >/dev/null
type systemd-detect-virt >/dev/null 2>&1 && systemd-detect-virt --quiet --container
}
run_grub_install()