From 626ce98ba7bdf5654d0f0fe6abf696788c9f246d Mon Sep 17 00:00:00 2001 From: Rodion Iafarov Date: Mon, 10 Dec 2018 09:35:32 +0100 Subject: [PATCH] Do not schedule enable_usb_repo when no usb repo is available See [poo#44708](https://progress.opensuse.org/issues/44708). --- lib/main_common.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/main_common.pm b/lib/main_common.pm index 76f228aaea6a..04f2e3cbe6ec 100644 --- a/lib/main_common.pm +++ b/lib/main_common.pm @@ -1082,7 +1082,11 @@ sub load_consoletests { loadtest "console/xorg_vt"; } loadtest "console/zypper_lr"; - loadtest 'console/enable_usb_repo' if check_var('USBBOOT', 1); + # Enable installation repo from the usb, unless we boot from USB, but don't use it + # for the installation, like in case of LiveCDs and when using http/smb/ftp mirror + if (check_var('USBBOOT', 1) && !is_livecd && !get_var('NETBOOT')) { + loadtest 'console/enable_usb_repo'; + } # Do not clear repos twice if replace repos for openSUSE # On staging repos are already removed, using CLEAR_REPOS flag variable