View | Details | Raw Unified | Return to bug 824609
Collapse All | Expand All

(-)a/src/Core/GRUB2EFI.pm (-4 / +12 lines)
Lines 88-102 sub GrubCfgSections { Link Here
88
                $sect_info{"usage"} = "linux";
88
                $sect_info{"usage"} = "linux";
89
            }
89
            }
90
90
91
            if ($cfg2 =~ /^\s+linux\s+([^\s]+)\s*(.*)$/m) {
91
            # bnc#824609 - installation boot parameters not written to GRUB_CMDLINE_LINUX_DEFAULT
92
                my $append = $2;
92
            # we need to match linuxefi command, otherwise the kernel append will lost
93
                $sect_info{"image"} = $1;
93
            if ($cfg2 =~ /^\s+(linux|linuxefi)\s+([^\s]+)\s*(.*)$/m) {
94
                my $append = $3;
95
                $sect_info{"image"} = $2;
96
                my $command = $1;
94
97
95
                if ($append =~ /root=/) {
98
                if ($append =~ /root=/) {
96
                    $append =~ s/root=([^\s]+)\s*//;
99
                    $append =~ s/root=([^\s]+)\s*//;
97
                    $sect_info{"root"} = $1;
100
                    $sect_info{"root"} = $1;
98
                }
101
                }
99
102
103
                # the ro is part of linuxefi entries created by grub2 scripts
104
                # not part of kernel append by yast
105
                if ( $command eq "linuxefi" ) {
106
                    $append =~ s/^ro\s*//;
107
                }
108
100
                if ($append =~ /vga=/) {
109
                if ($append =~ /vga=/) {
101
                    $append =~ s/vga=([^\s]+)\s*//;
110
                    $append =~ s/vga=([^\s]+)\s*//;
102
                    $sect_info{"vgamode"} = $1;
111
                    $sect_info{"vgamode"} = $1;
103
- 

Return to bug 824609