My commit 756a1ff9a08ff2b1a16202a32e667b56204accc5 broke unattended install with URL setting. This commit fixes it in a very simplistic way, since I was tired to dig into qemu devices code to try out adding unit=0/unit=1 suggested by Paolo, and also, this change would require more testing with other qemu branches, such as RHEL5/RHEL6 before we know it is safe.
CC: Paolo Bonzini <[email protected]> Signed-off-by: Lucas Meneghel Rodrigues <[email protected]> --- shared/cfg/guest-os/Linux/Fedora/17.i386.cfg | 1 + shared/cfg/guest-os/Linux/Fedora/17.x86_64.cfg | 1 + shared/cfg/guest-os/Linux/Fedora/18.i386.cfg | 1 + shared/cfg/guest-os/Linux/Fedora/18.x86_64.cfg | 1 + shared/cfg/guest-os/Linux/Fedora/19.i386.cfg | 1 + shared/cfg/guest-os/Linux/Fedora/19.x86_64.cfg | 1 + shared/cfg/guest-os/Linux/Fedora/test.i386.cfg | 1 + shared/cfg/guest-os/Linux/Fedora/test.x86_64.cfg | 1 + shared/cfg/guest-os/Linux/JeOS/17.x86_64.cfg | 1 + 9 files changed, 9 insertions(+) diff --git a/shared/cfg/guest-os/Linux/Fedora/17.i386.cfg b/shared/cfg/guest-os/Linux/Fedora/17.i386.cfg index 1313c7e..5404903 100644 --- a/shared/cfg/guest-os/Linux/Fedora/17.i386.cfg +++ b/shared/cfg/guest-os/Linux/Fedora/17.i386.cfg @@ -14,6 +14,7 @@ md5sum_cd1 = d4717e04b596e33898cc34970e79dd3d md5sum_1m_cd1 = 2cf9ce6b24cc0e39ec04d75499f1eb2d unattended_install.url: + kernel_params = "repo=cdrom:/dev/sr1 ks=cdrom:/dev/sr0 nicdelay=60 console=ttyS0,115200 console=tty0" url = http://dl.fedoraproject.org/pub/fedora/linux/releases/17/Fedora/i386/os qemu_guest_agent..check_reboot: gagent_guest_reboot_pattern = "machine restart" diff --git a/shared/cfg/guest-os/Linux/Fedora/17.x86_64.cfg b/shared/cfg/guest-os/Linux/Fedora/17.x86_64.cfg index e048277..ecc43b0 100644 --- a/shared/cfg/guest-os/Linux/Fedora/17.x86_64.cfg +++ b/shared/cfg/guest-os/Linux/Fedora/17.x86_64.cfg @@ -14,6 +14,7 @@ md5sum_cd1 = 26f3358a5f8973f0956093f28a0106e7 md5sum_1m_cd1 = 51988b8593ad488fe5a790a183cf3d81 unattended_install.url: + kernel_params = "repo=cdrom:/dev/sr1 ks=cdrom:/dev/sr0 nicdelay=60 console=ttyS0,115200 console=tty0" url = http://dl.fedoraproject.org/pub/fedora/linux/releases/17/Fedora/x86_64/os qemu_guest_agent..check_reboot: gagent_guest_reboot_pattern = "machine restart" diff --git a/shared/cfg/guest-os/Linux/Fedora/18.i386.cfg b/shared/cfg/guest-os/Linux/Fedora/18.i386.cfg index 103fbd8..ec72651 100644 --- a/shared/cfg/guest-os/Linux/Fedora/18.i386.cfg +++ b/shared/cfg/guest-os/Linux/Fedora/18.i386.cfg @@ -14,4 +14,5 @@ md5sum_cd1 = d4dcf10a2c98a99dca01b96aefc29590 md5sum_1m_cd1 = 19504a036ff13c127fa62ee27ca3e10f unattended_install.url: + kernel_params = "repo=cdrom:/dev/sr1 ks=cdrom:/dev/sr0 nicdelay=60 console=ttyS0,115200 console=tty0" url = http://dl.fedoraproject.org/pub/fedora/linux/releases/18/Fedora/i386/os diff --git a/shared/cfg/guest-os/Linux/Fedora/18.x86_64.cfg b/shared/cfg/guest-os/Linux/Fedora/18.x86_64.cfg index b1c9955..eeabfe0 100644 --- a/shared/cfg/guest-os/Linux/Fedora/18.x86_64.cfg +++ b/shared/cfg/guest-os/Linux/Fedora/18.x86_64.cfg @@ -14,4 +14,5 @@ md5sum_cd1 = 17d5c860bf9dc83e035882a7b33ffc77 md5sum_1m_cd1 = cb8d16fd4c32e0f4b57d60f1e08a7dce unattended_install.url: + kernel_params = "repo=cdrom:/dev/sr1 ks=cdrom:/dev/sr0 nicdelay=60 console=ttyS0,115200 console=tty0" url = http://dl.fedoraproject.org/pub/fedora/linux/releases/18/Fedora/x86_64/os diff --git a/shared/cfg/guest-os/Linux/Fedora/19.i386.cfg b/shared/cfg/guest-os/Linux/Fedora/19.i386.cfg index 7edf3b0..0a5fcfa 100644 --- a/shared/cfg/guest-os/Linux/Fedora/19.i386.cfg +++ b/shared/cfg/guest-os/Linux/Fedora/19.i386.cfg @@ -14,4 +14,5 @@ md5sum_cd1 = d3b02fda3010220a26d7fa41c929509c md5sum_1m_cd1 = 31fcaf802010041f06928fa51fd3e452 unattended_install.url: + kernel_params = "repo=cdrom:/dev/sr1 ks=cdrom:/dev/sr0 nicdelay=60 console=ttyS0,115200 console=tty0" url = http://dl.fedoraproject.org/pub/fedora/linux/releases/19/Fedora/i386/os diff --git a/shared/cfg/guest-os/Linux/Fedora/19.x86_64.cfg b/shared/cfg/guest-os/Linux/Fedora/19.x86_64.cfg index a901649..fd5e81c 100644 --- a/shared/cfg/guest-os/Linux/Fedora/19.x86_64.cfg +++ b/shared/cfg/guest-os/Linux/Fedora/19.x86_64.cfg @@ -14,4 +14,5 @@ md5sum_cd1 = 638d69c23621d5befc714bcd66b0611e md5sum_1m_cd1 = 21204a7d8e018064dd85ca1ecbc5f1c4 unattended_install.url: + kernel_params = "repo=cdrom:/dev/sr1 ks=cdrom:/dev/sr0 nicdelay=60 console=ttyS0,115200 console=tty0" url = http://dl.fedoraproject.org/pub/fedora/linux/releases/19/Fedora/x86_64/os diff --git a/shared/cfg/guest-os/Linux/Fedora/test.i386.cfg b/shared/cfg/guest-os/Linux/Fedora/test.i386.cfg index 30f3ff7..417a13b 100644 --- a/shared/cfg/guest-os/Linux/Fedora/test.i386.cfg +++ b/shared/cfg/guest-os/Linux/Fedora/test.i386.cfg @@ -12,4 +12,5 @@ unattended_install.cdrom: cdrom_cd1 = isos/linux/Fedora-18-Beta-i386-DVD.iso unattended_install.url: + kernel_params = "repo=cdrom:/dev/sr1 ks=cdrom:/dev/sr0 nicdelay=60 console=ttyS0,115200 console=tty0" url = http://dl.fedoraproject.org/pub/fedora/linux/releases/test/Fedora/i386/os diff --git a/shared/cfg/guest-os/Linux/Fedora/test.x86_64.cfg b/shared/cfg/guest-os/Linux/Fedora/test.x86_64.cfg index 86b9c00..2a53ef3 100644 --- a/shared/cfg/guest-os/Linux/Fedora/test.x86_64.cfg +++ b/shared/cfg/guest-os/Linux/Fedora/test.x86_64.cfg @@ -12,4 +12,5 @@ unattended_install.cdrom: cdrom_cd1 = isos/linux/Fedora-18-Beta-x86_64-DVD.iso unattended_install.url: + kernel_params = "repo=cdrom:/dev/sr1 ks=cdrom:/dev/sr0 nicdelay=60 console=ttyS0,115200 console=tty0" url = http://dl.fedoraproject.org/pub/fedora/linux/releases/test/Fedora/x86_64/os diff --git a/shared/cfg/guest-os/Linux/JeOS/17.x86_64.cfg b/shared/cfg/guest-os/Linux/JeOS/17.x86_64.cfg index 53e6ce9..1be33f3 100644 --- a/shared/cfg/guest-os/Linux/JeOS/17.x86_64.cfg +++ b/shared/cfg/guest-os/Linux/JeOS/17.x86_64.cfg @@ -17,4 +17,5 @@ md5sum_cd1 = 26f3358a5f8973f0956093f28a0106e7 md5sum_1m_cd1 = 51988b8593ad488fe5a790a183cf3d81 unattended_install.url: + kernel_params = "repo=cdrom:/dev/sr1 ks=cdrom:/dev/sr0 nicdelay=60 console=ttyS0,115200 console=tty0" url = http://dl.fedoraproject.org/pub/fedora/linux/releases/17/Fedora/x86_64/os -- 1.8.3.1 _______________________________________________ Virt-test-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/virt-test-devel
