From 93ac89bceea5de6c0790fa95fbeddbfb3fdd4f64 Mon Sep 17 00:00:00 2001 From: Shawn Dunn Date: Sat, 6 Jan 2024 01:47:05 +0000 Subject: [PATCH] Accepting request 1136308 from home:dopice:branches:devel:microos:kalpa Changed the online check from using ping to cURL. Since Flatpak uses https to download the packages, I believe the online check should use the same method. I discovered this when installing a new computer in a network which have restricted outbouond ICMP. OBS-URL: https://build.opensuse.org/request/show/1136308 OBS-URL: https://build.opensuse.org/package/show/devel:microos:kalpa/plasma-branding-Kalpa?expand=0&rev=9 --- kalpa-firstboot | 2 +- plasma-branding-Kalpa.changes | 5 +++++ plasma-branding-Kalpa.spec | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/kalpa-firstboot b/kalpa-firstboot index 7181ee9..330d340 100644 --- a/kalpa-firstboot +++ b/kalpa-firstboot @@ -17,7 +17,7 @@ run_task() { fi } -run_task 1 "Waiting for Internet connection" 'until /usr/bin/ping -q -c 1 flathub.org; do sleep 1; done' +run_task 1 "Waiting for Internet connection" 'until /usr/bin/curl -s --max-time 5 https://flathub.org > /dev/null; do sleep 1; done' run_task 2 "Adding Flathub Repository" /usr/bin/flatpak remote-add --user --if-not-exists flathub /usr/share/kalpa/flathub.flatpakrepo run_task 3 "Installing Firefox" /usr/bin/flatpak install --user --noninteractive flathub org.mozilla.firefox run_task 4 "Installing KCalc" /usr/bin/flatpak install --user --noninteractive flathub org.kde.kcalc diff --git a/plasma-branding-Kalpa.changes b/plasma-branding-Kalpa.changes index fc104f9..8cf258f 100644 --- a/plasma-branding-Kalpa.changes +++ b/plasma-branding-Kalpa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 2 22:28:11 UTC 2024 - dopice <0xdopice@protonmail.com> + +- Use cURL instead of ping for online check + ------------------------------------------------------------------- Wed Dec 27 18:50:53 UTC 2023 - Shawn Dunn diff --git a/plasma-branding-Kalpa.spec b/plasma-branding-Kalpa.spec index a6398d8..fd8ab82 100644 --- a/plasma-branding-Kalpa.spec +++ b/plasma-branding-Kalpa.spec @@ -1,7 +1,7 @@ # # spec file for package plasma-branding-Kalpa # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2021 SUSE Software Solutions GmbH # # All modifications and additions to the file contributed by third parties