[neon/neon/calamares-settings/Neon/release] desktop: reinstall keyring

[Jonathan Riddell]

Git commit e72762b4f45b3b290924d492fd57c100113116d1 by Jonathan Riddell.
Committed on 27/09/2024 at 12:32.
Pushed by jriddell into branch 'Neon/release'.

reinstall keyring

A  +11   -0    desktop/calamares/desktop/modules/shellprocess at aptsources.conf
M  +4    -0    desktop/calamares/desktop/settings.conf
A  +15   -0    desktop/usr/bin/calamares-aptsources

https://invent.kde.org/neon/neon/calamares-settings/-/commit/e72762b4f45b3b290924d492fd57c100113116d1

diff --git a/desktop/calamares/desktop/modules/shellprocess at aptsources.conf b/desktop/calamares/desktop/modules/shellprocess at aptsources.conf
new file mode 100644
index 0000000..4781f41
--- /dev/null
+++ b/desktop/calamares/desktop/modules/shellprocess at aptsources.conf
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2020 Harald Sitter <sitter at kde.org>
+#
+# This is run inside the chroot!
+# Carries nomodeset into the installed system iff the live system is running
+# with it.
+---
+dontChroot: false
+timeout: 60
+script:
+    - "/usr/bin/calamares-aptsources"
diff --git a/desktop/calamares/desktop/settings.conf b/desktop/calamares/desktop/settings.conf
index 19e2212..d27ca12 100644
--- a/desktop/calamares/desktop/settings.conf
+++ b/desktop/calamares/desktop/settings.conf
@@ -29,6 +29,9 @@ instances:
 - id: nomodeset
   module: shellprocess
   config: shellprocess at nomodeset.conf
+- id: aptsources
+  module: shellprocess
+  config: shellprocess at aptsources.conf
 
 sequence:
 
@@ -62,6 +65,7 @@ sequence:
     - bootloader
     - contextualprocess at after_bootloader
     - shellprocess at nomodeset
+    - shellprocess at aptsources
     - shellprocess at install_translations
     - packages
     - neon-fs-cleanup
diff --git a/desktop/usr/bin/calamares-aptsources b/desktop/usr/bin/calamares-aptsources
new file mode 100755
index 0000000..5272ef4
--- /dev/null
+++ b/desktop/usr/bin/calamares-aptsources
@@ -0,0 +1,15 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2020 Harald Sitter <sitter at kde.org>
+
+# Carry nomodeset into chroot
+
+set -ex
+
+echo "Reinstalling neon-keyring"
+
+ls /etc/apt/sources.list.d/
+
+apt-get install --reinstall neon-keyring
+
+ls /etc/apt/sources.list.d/