Author: jsrain Date: Mon Jun 8 10:38:03 2009 New Revision: 57477 URL: http://svn.opensuse.org/viewcvs/yast?rev=57477&view=rev Log: do not add 'ide=nodma' to failsafe kernel parameter (bnc#510784) Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/modules/BootArch.ycp trunk/bootloader/testsuite/tests/update.out Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootload... ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Mon Jun 8 10:38:03 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jun 8 10:37:27 CEST 2009 - jsrain@suse.cz + +- do not add 'ide=nodma' to failsafe kernel parameter (bnc#510784) + +------------------------------------------------------------------- Mon May 25 16:23:55 CEST 2009 - jreidinger@suse.cz - refactor Update code (update between products) Modified: trunk/bootloader/src/modules/BootArch.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootArch.y... ============================================================================== --- trunk/bootloader/src/modules/BootArch.ycp (original) +++ trunk/bootloader/src/modules/BootArch.ycp Mon Jun 8 10:38:03 2009 @@ -98,15 +98,15 @@ string ret = ""; if (Arch::i386 ()) { - ret = "showopts ide=nodma apm=off noresume nosmp maxcpus=0 edd=off powersaved=off nohz=off highres=off processor.max_cstate=1"; + ret = "showopts apm=off noresume nosmp maxcpus=0 edd=off powersaved=off nohz=off highres=off processor.max_cstate=1"; } else if (Arch::x86_64 ()) { - ret = "showopts ide=nodma apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1"; + ret = "showopts apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1"; } else if (Arch::ia64 ()) { - ret = "ide=nodma nohalt noresume powersaved=off"; + ret = "nohalt noresume powersaved=off"; } else if (Arch::s390 ()) { Modified: trunk/bootloader/testsuite/tests/update.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/testsuite/tests/update... ============================================================================== --- trunk/bootloader/testsuite/tests/update.out (original) +++ trunk/bootloader/testsuite/tests/update.out Mon Jun 8 10:38:03 2009 @@ -1,10 +1,10 @@ Dump ====================================== Return true Return nil -Return $["initrd":$["list":["reiserfs"], "settings":$["reiserfs":$[]]], "loader_device":"/dev/sda", "loader_type":"grub", "location":"mbr", "specific":$["activate":false, "device_map":[["(hd0)", "/dev/sda"], ["(hd1)", "/dev/sdb"], ["(fd0)", "/dev/fd0"]], "global":[$["key":"color", "value":"white/blue black/light-gray"], $["key":"timeout", "value":8], $["key":"gfxmenu", "value":"(null)/message"]], "repl_mbr":false, "sections":[[$["key":"title", "value":"Linux"], $["key":"kernel", "value":"(null)/vmlinuz root=/dev/sda3 selinux=0 showopts splash=silent"], $["key":"initrd", "value":"(null)/initrd"], $["key":"__intern__", "value":$["auto":true, "changed":false, "devs":["/dev/sda1", "/dev/sda3"], "initrd":"/boot/initrd", "kernel":"/boot/vmlinuz", "type":"linux"]]], [$["key":"title", "value":"Disketa"], $["key":"root", "value":"(fd0)"], $["key":"chainloader", "value":"+1"], $["key":"__intern__", "value":$["type":"floppy"]]], [$["key":"title", "value":"test_sect"], $["key":"kernel", "value":"(hd0,0)/vmlinuz root=/dev/sdb4 vga=0x31a selinux=0 splash=silent resume=/dev/sdb2"], $["key":"initrd", "value":"(hd0,0)/initrd"]], [$["key":"title", "value":"other"], $["key":"kernel", "value":"(hd0,0)/vmlinuz root=/dev/hdb4 vga=0x31a selinux=0 splash=silent resume=/dev/hdb2"], $["key":"initrd", "value":"(hd0,0)/initrd"]], [$["key":"title", "value":"other2"], $["key":"root", "value":"(hd1)"], $["key":"chainloader", "value":"+1"]], [$["key":"title", "value":"Test pameti"], $["key":"kernel", "value":"(hd0,0)/memtest.bin"]], [$["key":"title", "value":"Failsafe"], $["key":"kernel", "value":"(null)/vmlinuz root=/dev/sda3 showopts ide=nodma apm=off acpi=off vga=normal noresume selinux=0 barrier=off nosmp noapic maxcpus=0 3"], $["key":"initrd", "value":"(null)/initrd"], $["key":"__intern__", "value":$["auto":true, "changed":false, "devs":["/dev/sda1", "/dev/sda3"], "initrd":"/boot/initrd", "kernel":"/boot/vmlinuz", "type":"failsafe"]]], [$["key":"kernel", "value":"(null)/memtest.bin"], $["key":"title", "value":"Memory Test"], $["key":"__intern__", "value":$["auto":true, "changed":false, "devs":["/dev/sda1"], "kernel":"/boot/memtest.bin", "type":"memtest86"]]]]], "write_settings":$[]] +Return $["initrd":$["list":["reiserfs"], "settings":$["reiserfs":$[]]], "loader_device":"/dev/sda", "loader_type":"grub", "location":"mbr", "specific":$["activate":false, "device_map":[["(hd0)", "/dev/sda"], ["(hd1)", "/dev/sdb"], ["(fd0)", "/dev/fd0"]], "global":[$["key":"color", "value":"white/blue black/light-gray"], $["key":"timeout", "value":8], $["key":"gfxmenu", "value":"(null)/message"]], "repl_mbr":false, "sections":[[$["key":"title", "value":"Linux"], $["key":"kernel", "value":"(null)/vmlinuz root=/dev/sda3 selinux=0 showopts splash=silent"], $["key":"initrd", "value":"(null)/initrd"], $["key":"__intern__", "value":$["auto":true, "changed":false, "devs":["/dev/sda1", "/dev/sda3"], "initrd":"/boot/initrd", "kernel":"/boot/vmlinuz", "type":"linux"]]], [$["key":"title", "value":"Disketa"], $["key":"root", "value":"(fd0)"], $["key":"chainloader", "value":"+1"], $["key":"__intern__", "value":$["type":"floppy"]]], [$["key":"title", "value":"test_sect"], $["key":"kernel", "value":"(hd0,0)/vmlinuz root=/dev/sdb4 vga=0x31a selinux=0 splash=silent resume=/dev/sdb2"], $["key":"initrd", "value":"(hd0,0)/initrd"]], [$["key":"title", "value":"other"], $["key":"kernel", "value":"(hd0,0)/vmlinuz root=/dev/hdb4 vga=0x31a selinux=0 splash=silent resume=/dev/hdb2"], $["key":"initrd", "value":"(hd0,0)/initrd"]], [$["key":"title", "value":"other2"], $["key":"root", "value":"(hd1)"], $["key":"chainloader", "value":"+1"]], [$["key":"title", "value":"Test pameti"], $["key":"kernel", "value":"(hd0,0)/memtest.bin"]], [$["key":"title", "value":"Failsafe"], $["key":"kernel", "value":"(null)/vmlinuz root=/dev/sda3 showopts apm=off acpi=off vga=normal noresume selinux=0 barrier=off nosmp noapic maxcpus=0 3"], $["key":"initrd", "value":"(null)/initrd"], $["key":"__intern__", "value":$["auto":true, "changed":false, "devs":["/dev/sda1", "/dev/sda3"], "initrd":"/boot/initrd", "kernel":"/boot/vmlinuz", "type":"failsafe"]]], [$["key":"kernel", "value":"(null)/memtest.bin"], $["key":"title", "value":"Memory Test"], $["key":"__intern__", "value":$["auto":true, "changed":false, "devs":["/dev/sda1"], "kernel":"/boot/memtest.bin", "type":"memtest86"]]]]], "write_settings":$[]] Dump ====================================== Return true Return nil -Return $["initrd":$["list":["reiserfs"], "settings":$["reiserfs":$[]]], "loader_device":"/dev/sda", "loader_type":"lilo", "location":"mbr", "specific":$["activate":false, "global":[$["key":"boot", "value":"/dev/sda"]], "repl_mbr":false, "sections":[[$["key":"label", "value":"Linux"], $["key":"image", "value":"/boot/vmlinuz"], $["key":"initrd", "value":"/boot/initrd"], $["key":"root", "value":"/dev/sda3"], $["key":"append", "value":"selinux=0 splash=silent "], $["key":"__intern__", "value":$["auto":true, "changed":false, "devs":["/dev/sda3"], "type":"linux"]]], [$["key":"image", "value":"/boot/vmlinuz"], $["key":"label", "value":"test_sect"], $["key":"initrd", "value":"/boot/initrd"], $["key":"root", "value":"/dev/sdb4"], $["key":"append", "value":"resume=/dev/sdb2 selinux=0"], $["key":"vga", "value":"0x31a"]], [$["key":"image", "value":"/boot/vmlinuz"], $["key":"label", "value":"Other"], $["key":"initrd", "value":"/boot/initrd"], $["key":"root", "value":"/dev/hdb4"], $["key":"append", "value":"resume=/dev/hdb2 selinux=0"], $["key":"vga", "value":"0x31a"]], [$["key":"value", "value":"other2"], $["key":"other", "value":"/dev/sdb3"]], [$["key":"label", "value":"Test_pameti"], $["key":"image", "value":"/boot/memtest.bin"]], [$["key":"label", "value":"Failsafe"], $["key":"image", "value":"/boot/vmlinuz"], $["key":"initrd", "value":"/boot/initrd"], $["key":"root", "value":"/dev/sda3"], $["key":"append", "value":"ide=nodma apm=off acpi=off vga=normal noresume selinux=0 barrier=off nosmp noapic maxcpus=0 3"], $["key":"__intern__", "value":$["auto":true, "changed":false, "devs":["/dev/sda3"], "type":"failsafe"]]], [$["key":"image", "value":"/boot/memtest.bin"], $["key":"label", "value":"Memory_Test"], $["key":"__intern__", "value":$["auto":true, "changed":false, "devs":[], "type":"memtest86"]]]]], "write_settings":$[]] +Return $["initrd":$["list":["reiserfs"], "settings":$["reiserfs":$[]]], "loader_device":"/dev/sda", "loader_type":"lilo", "location":"mbr", "specific":$["activate":false, "global":[$["key":"boot", "value":"/dev/sda"]], "repl_mbr":false, "sections":[[$["key":"label", "value":"Linux"], $["key":"image", "value":"/boot/vmlinuz"], $["key":"initrd", "value":"/boot/initrd"], $["key":"root", "value":"/dev/sda3"], $["key":"append", "value":"selinux=0 splash=silent "], $["key":"__intern__", "value":$["auto":true, "changed":false, "devs":["/dev/sda3"], "type":"linux"]]], [$["key":"image", "value":"/boot/vmlinuz"], $["key":"label", "value":"test_sect"], $["key":"initrd", "value":"/boot/initrd"], $["key":"root", "value":"/dev/sdb4"], $["key":"append", "value":"resume=/dev/sdb2 selinux=0"], $["key":"vga", "value":"0x31a"]], [$["key":"image", "value":"/boot/vmlinuz"], $["key":"label", "value":"Other"], $["key":"initrd", "value":"/boot/initrd"], $["key":"root", "value":"/dev/hdb4"], $["key":"append", "value":"resume=/dev/hdb2 selinux=0"], $["key":"vga", "value":"0x31a"]], [$["key":"value", "value":"other2"], $["key":"other", "value":"/dev/sdb3"]], [$["key":"label", "value":"Test_pameti"], $["key":"image", "value":"/boot/memtest.bin"]], [$["key":"label", "value":"Failsafe"], $["key":"image", "value":"/boot/vmlinuz"], $["key":"initrd", "value":"/boot/initrd"], $["key":"root", "value":"/dev/sda3"], $["key":"append", "value":"apm=off acpi=off vga=normal noresume selinux=0 barrier=off nosmp noapic maxcpus=0 3"], $["key":"__intern__", "value":$["auto":true, "changed":false, "devs":["/dev/sda3"], "type":"failsafe"]]], [$["key":"image", "value":"/boot/memtest.bin"], $["key":"label", "value":"Memory_Test"], $["key":"__intern__", "value":$["auto":true, "changed":false, "devs":[], "type":"memtest86"]]]]], "write_settings":$[]] Dump ====================================== Dump ====================================== -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org