Your message dated Fri, 23 Jun 2017 12:42:20 +0100
with message-id <[email protected]>
and subject line Re: Bug#813007: Fix container detection (running-in-container 
is an Ubuntu-ism)
has caused the Debian Bug report #813007,
regarding Fix container detection (running-in-container is an Ubuntu-ism)
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
813007: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813007
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: grub2
Version: 2.02~beta2-35
Tags: patch
User: [email protected]
Usertags: origin-ubuntu ubuntu-patch xenial

Hello,

grub2 currently tries to call running-in-container in its postinst and
zz-update-grub. This script is an Ubuntu-ism and going away (see
https://launchpad.net/bugs/1539016), and thus container detection does
not work under Debian.

Please use systemd-detect-virt --container instead, which works under
any init system (despite the name). running-in-container is just an
(overly complicated) wrapper around systemd-detect-virt.

debdiff attached.

Thanks for considering,

Martin

-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)
diff -Nru grub2-2.02~beta2/debian/changelog grub2-2.02~beta2/debian/changelog
--- grub2-2.02~beta2/debian/changelog   2016-01-22 12:02:11.000000000 +0100
+++ grub2-2.02~beta2/debian/changelog   2016-01-28 14:30:23.000000000 +0100
@@ -1,3 +1,10 @@
+grub2 (2.02~beta2-35ubuntu1) xenial; urgency=medium
+
+  * debian/postinst.in, debian/kernel/zz-update-grub: Call systemd-detect-virt
+    instead of the Ubuntu specific running-in-container wrapper. (LP: #1539016)
+
+ -- Martin Pitt <[email protected]>  Thu, 28 Jan 2016 14:25:14 +0100
+
 grub2 (2.02~beta2-35) unstable; urgency=medium
 
   * Apply the arm64 -mpc-relative-literal-loads workaround in configure
diff -Nru grub2-2.02~beta2/debian/kernel/zz-update-grub 
grub2-2.02~beta2/debian/kernel/zz-update-grub
--- grub2-2.02~beta2/debian/kernel/zz-update-grub       2016-01-22 
12:00:21.000000000 +0100
+++ grub2-2.02~beta2/debian/kernel/zz-update-grub       2016-01-28 
14:27:16.000000000 +0100
@@ -3,8 +3,8 @@
 
 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
 
diff -Nru grub2-2.02~beta2/debian/postinst.in 
grub2-2.02~beta2/debian/postinst.in
--- grub2-2.02~beta2/debian/postinst.in 2016-01-22 12:00:21.000000000 +0100
+++ grub2-2.02~beta2/debian/postinst.in 2016-01-28 14:30:22.000000000 +0100
@@ -296,7 +296,7 @@
 
 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()

Attachment: signature.asc
Description: Digital signature


--- End Message ---
--- Begin Message ---
Source: grub2
Source-Version: 2.02~beta2-36

On Thu, Jan 28, 2016 at 02:55:26PM +0100, Martin Pitt wrote:
> grub2 currently tries to call running-in-container in its postinst and
> zz-update-grub. This script is an Ubuntu-ism and going away (see
> https://launchpad.net/bugs/1539016), and thus container detection does
> not work under Debian.
> 
> Please use systemd-detect-virt --container instead, which works under
> any init system (despite the name). running-in-container is just an
> (overly complicated) wrapper around systemd-detect-virt.
> 
> debdiff attached.

I applied this patch ages ago in grub2 2.02~beta2-36, but didn't notice
that it didn't close this bug in the changelog.  Closing now.

Thanks,

-- 
Colin Watson                                       [[email protected]]

--- End Message ---

Reply via email to