Comment # 4 on bug 963610 from Bj�rn Voigt

(In reply to Thomas Blume from comment #3)
> I've build some testpackages with a proposed fix at:
> 
> http://download.opensuse.org/repositories/home:/tsaupe:/branches:/openSUSE:/
> Leap:/42.1:/Update:/boo963610-systemd/standard/
> 
> Can you please test and report wheter the issue is fixed therwith?

I tested this. It doesn't work alone.

The function prepare-parameters in /usr/bin/systemd-sleep-grub alone now works
for the given example with the comment line. Personally I would prefer

. /etc/sysconfig/bootloader

over

eval `grep ^LOADER_TYPE= /etc/sysconfig/bootloader`

because sourcing /etc/sysconfig/bootloader also works with spaces, e.g.

#LOADER_TYPE="grub2-efi"
  LOADER_TYPE="grub2"

But the other problem is, that grub2 has a problem too with the comment line.

With

#LOADER_TYPE="none"
LOADER_TYPE="grub2-efi"

in /etc/sysconfig/bootloader

grub2-once does not work:

# grub2-once --list
no grub2_dir at /usr/sbin/grub2-once line 85.

These lines in /usr/sbin/grub2-once need a patch too:

[..]
open(SYSCONF, "</etc/sysconfig/bootloader") || die "cannot read bootloader
sysconfig: $!\n";

$grub2_dir = "";
while (<SYSCONF>) {
    if (/LOADER_TYPE="(.*)"/) {
        my $bl = $1;
        if ($bl eq "grub2" || $bl eq "grub2-efi") {
            $grub2_dir = "/boot/grub2";
            $grub2_reboot = "/usr/sbin/grub2-reboot";
        }
        last;
    }
}

close (SYSCONF);
[..]

I attach a patch for grub2.

I tested successfully the testpackage together with my grub fix.