Bug#842315: Misdetects systemd with merged-usr

[Felipe Sateler]

Package: grub-common
Version: 2.02~beta3-1
Followup-For: Bug #842315
Control: tags -1 patch

Hi,

This patch fixes the issue. It is as simple as resolving the
symlinks for the known names as well:

--- /etc/grub.d/10_linux	2016-10-28 19:02:21.057213089 -0300
+++ 10_linux	2016-10-28 19:02:43.841806736 -0300
@@ -349,7 +349,7 @@
               "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
   for supported_init in ${SUPPORTED_INITS}; do
     init_path="${supported_init#*:}"
-    if [ -x "${init_path}" ] && [ "$(readlink -f /sbin/init)" != "${init_path}" ]; then
+    if [ -x "${init_path}" ] && [ "$(readlink -f /sbin/init)" != "$(readlink -f ${init_path})" ]; then
       linux_entry "${OS}" "${version}" "init-${supported_init%%:*}" \
 		  "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} init=${init_path}"
     fi


Saludos

-- System Information:
Debian Release: stretch/sid
  APT prefers unstable-debug
  APT policy: (500, 'unstable-debug'), (500, 'unstable'), (1, 'experimental-debug'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.7.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages grub-common depends on:
ii  gettext-base        0.19.8.1-1
ii  libc6               2.24-5
ii  libdevmapper1.02.1  2:1.02.133-1
ii  libfreetype6        2.6.3-3+b1
ii  libfuse2            2.9.7-1
ii  liblzma5            5.2.2-1.2

Versions of packages grub-common recommends:
ii  os-prober  1.71

Versions of packages grub-common suggests:
pn  console-setup  <none>
ii  desktop-base   8.0.2
pn  grub-emu       <none>
pn  multiboot-doc  <none>
pn  xorriso        <none>

-- Configuration Files:
/etc/grub.d/10_linux changed [not included]

-- no debconf information