From 49465e0a0987c19050f0419549d1d1ba2c0151da Mon Sep 17 00:00:00 2001
From: Joan Torres Lopez <joantolo@redhat.com>
Date: Fri, 10 Jul 2026 13:56:05 +0200
Subject: [PATCH] Update conflicting patches

Related: https://redhat.atlassian.net/browse/RHEL-194090
---
 ...etwork-configuration-on-login-screen.patch | 63 +------------------
 1 file changed, 3 insertions(+), 60 deletions(-)

diff --git a/0001-data-Disable-network-configuration-on-login-screen.patch b/0001-data-Disable-network-configuration-on-login-screen.patch
index 7a1d38d..62a8a3e 100644
--- a/0001-data-Disable-network-configuration-on-login-screen.patch
+++ b/0001-data-Disable-network-configuration-on-login-screen.patch
@@ -10,37 +10,10 @@ Subject: [PATCH] data: Disable network configuration on login screen
  create mode 100644 data/org.gnome.gdm.rules.in
 
 diff --git a/data/meson.build b/data/meson.build
-index 7c5222ea..20d39a36 100644
+index 780878c..40b8720 100644
 --- a/data/meson.build
 +++ b/data/meson.build
-@@ -130,60 +130,70 @@ pam_data_files_map = {
-   ],
-   'arch': [
-     'gdm-autologin',
-     'gdm-launch-environment',
-     'gdm-fingerprint',
-     'gdm-smartcard',
-     'gdm-password',
-   ],
-   'none': [],
-   # We should no longer have 'autodetect' at this point
- }
- 
- pam_data_files = pam_data_files_map[default_pam_config]
- pam_prefix = (get_option('pam-prefix') != '')? get_option('pam-prefix') : get_option('sysconfdir')
- foreach _pam_filename : pam_data_files
-   install_data('pam-@0@/@1@.pam'.format(default_pam_config, _pam_filename),
-     rename: _pam_filename,
-     install_dir: pam_prefix / 'pam.d',
-   )
- endforeach
- 
- gdm_rules = configure_file(
-   input: '61-gdm.rules.in',
-   output: '@BASENAME@',
-   configuration: {
-     'libexecdir': gdm_prefix / get_option('libexecdir'),
-   },
+@@ -178,6 +178,16 @@ gdm_rules = configure_file(
    install_dir: udev_dir,
  )
  
@@ -57,36 +30,9 @@ index 7c5222ea..20d39a36 100644
  # DBus service files
  service_config = configuration_data()
  service_config.set('sbindir', gdm_prefix / get_option('sbindir'))
- service_config.set('GDM_INITIAL_VT', get_option('initial-vt'))
- service_config.set('LANG_CONFIG_FILE', lang_config_file)
- if plymouth_dep.found()
-   service_config.set('PLYMOUTH_QUIT_SERVICE', 'plymouth-quit.service')
- else
-   service_config.set('PLYMOUTH_QUIT_SERVICE', '')
- endif
- 
- if get_option('systemdsystemunitdir') != ''
-   systemd_systemunitdir = get_option('systemdsystemunitdir')
- else
-   systemd_systemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
- endif
- 
- if get_option('systemduserunitdir') != ''
-   systemd_userunitdir = get_option('systemduserunitdir')
- else
-   systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-                                                            define_variable: ['prefix', get_option('prefix')])
- endif
- 
- configure_file(
-   input: 'gdm.service.in',
-   output: '@BASENAME@',
-   configuration: service_config,
-   install_dir: systemd_systemunitdir,
-   format: 'cmake'
 diff --git a/data/org.gnome.gdm.rules.in b/data/org.gnome.gdm.rules.in
 new file mode 100644
-index 00000000..09544f11
+index 0000000..09544f1
 --- /dev/null
 +++ b/data/org.gnome.gdm.rules.in
 @@ -0,0 +1,8 @@
@@ -98,6 +44,3 @@ index 00000000..09544f11
 +
 +    return polkit.Result.NOT_HANDLED;
 +});
--- 
-2.32.0
-