Bug#842315: Misdetects systemd with merged-usr

2017-03-17 Thread Michael Biebl 
Hi Colin,

did you have a chance to look at Felipe's patch?
Seems fine to me. So if you plan another upload for stretch, it would be
nice to include this patch.

Regards,
Michael

On Fri, 28 Oct 2016 19:06:47 -0300 Felipe Sateler 
wrote:
> 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
> 
> 


-- 
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?



signature.asc
Description: OpenPGP digital signature

Bug#842315: Misdetects systemd with merged-usr

2016-10-28 Thread 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_linux2016-10-28 19:02:21.057213089 -0300
+++ 10_linux2016-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-base0.19.8.1-1
ii  libc6   2.24-5
ii  libdevmapper1.02.1  2:1.02.133-1
ii  libfreetype62.6.3-3+b1
ii  libfuse22.9.7-1
ii  liblzma55.2.2-1.2

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

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

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

-- no debconf information

Bug#842315: Misdetects systemd with merged-usr

2016-10-27 Thread Michael Biebl 
Package: grub-common
Version: 2.02~beta3-1
Severity: important
File: /etc/grub.d/10_linux
User: m...@linux.it
Usertags: usrmerge

debootstrap switched the default to have a merged-/usr setup.
This means, /lib/ will be a symlink to /usr/lib for new installations.

10_linux and 20_linux_xen have
SUPPORTED_INITS="sysvinit:/lib/sysvinit/init
systemd:/lib/systemd/systemd upstart:/sbin/upstart

and then it checks if /sbin/init points to any of those binaries.

On a merged-/usr system with systemd as default,
readlink -f /sbin/init resolves to /usr/lib/systemd/systemd

As a result, grub thinks that systemd is not the default and generates a
separate boot entry for systemd. This is unnecessary and a bit
confusing.

Regards,
Michael

P.S:

While looking at 10_linux, I noticed /lib/sysvinit/init (sysvinit) and
/sbin/upstart (upstart) which have been removed in stretch. But
I guess it's fine to keep support for one more release cycle for those
who upgrade from jessie.



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

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

Versions of packages grub-common depends on:
ii  gettext-base0.19.8.1-1
ii  libc6   2.24-5
ii  libdevmapper1.02.1  2:1.02.133-1
ii  libfreetype62.6.3-3+b1
ii  libfuse22.9.7-1
ii  liblzma55.2.2-1.2

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

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

-- Configuration Files:
/etc/grub.d/40_custom changed [not included]

-- no debconf information