From f11a992f6d2f3569eb7873f78508a8f8af70b631579b368c720d62c0b692e141 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Tue, 2 Jan 2024 08:40:15 +0000 Subject: [PATCH] Accepting request 1135493 from home:dopice:branches:devel:microos:aeon 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/1135493 OBS-URL: https://build.opensuse.org/package/show/devel:microos:aeon/gnome-branding-Aeon?expand=0&rev=14 --- aeon-firstboot | 2 +- gnome-branding-Aeon.changes | 5 +++++ gnome-branding-Aeon.spec | 12 ++++++------ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/aeon-firstboot b/aeon-firstboot index eac80a7..f32bc69 100644 --- a/aeon-firstboot +++ b/aeon-firstboot @@ -1,7 +1,7 @@ #!/bin/sh ( echo "# Waiting for Internet connection" -until /usr/bin/ping -q -c 1 flathub.org; do sleep 1; done +until /usr/bin/curl -s --max-time 5 https://flathub.org > /dev/null; do sleep 1; done echo "10" echo "# Adding Flathub Repository" diff --git a/gnome-branding-Aeon.changes b/gnome-branding-Aeon.changes index 77420f8..d34ef59 100644 --- a/gnome-branding-Aeon.changes +++ b/gnome-branding-Aeon.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 28 14:52:59 UTC 2023 - dopice <0xdopice@protonmail.com> + +- Use cURL instead of ping for online check + ------------------------------------------------------------------- Mon Sep 25 09:06:27 UTC 2023 - Richard Brown diff --git a/gnome-branding-Aeon.spec b/gnome-branding-Aeon.spec index 1128483..9023ca8 100644 --- a/gnome-branding-Aeon.spec +++ b/gnome-branding-Aeon.spec @@ -28,7 +28,7 @@ Source2: flathub.flatpakrepo Source3: aeon-firstboot.desktop Source4: aeon-firstboot Source5: 50-desktop.conf -Source6: aeonwallpaper.png +Source6: aeonwallpaper.png Source7: distrobox-upgrade-all.service Source8: distrobox-upgrade-all.timer Source9: 50-aeon @@ -37,15 +37,15 @@ Source11: 49-aeon.rules BuildArch: noarch BuildRequires: flatpak BuildRequires: gio-branding-openSUSE -BuildRequires: transactional-update -BuildRequires: systemd-rpm-macros -BuildRequires: sudo BuildRequires: polkit -Requires: polkit -Requires: sudo +BuildRequires: sudo +BuildRequires: systemd-rpm-macros +BuildRequires: transactional-update Requires: flatpak Requires: gio-branding-openSUSE +Requires: polkit Requires: sound-theme-freedesktop +Requires: sudo Requires: transactional-update Requires: zenity Obsoletes: gnome-branding-MicroOS