2 Commits

Author SHA256 Message Date
c3023a9c5d - Link against ldap.so instead of ldap_r.so; the former now provides
thread-safety and the latter is a symlink which may not exist
  (bsc#1249966)
  * drop autofs-use-libldap_r-instead-of-libldap-for-thread-safety.patch
- Fix autofs-5.1.1-dbus-udisks-monitor.patch (bsc#1246612) to account for:
  * d2feac6784b6 autofs-5.1.6 - make autofs.a a shared library
  * bcd8e1b642e9 autofs-5.0.7 - use LIBS for link libraries
2025-10-16 11:38:24 +11:00
58974632e6 Sync changes to SLFO-1.2 branch 2025-08-20 09:03:40 +02:00
3 changed files with 8 additions and 30 deletions

View File

@@ -4,24 +4,10 @@
#
# Matthias Koenig <mkoenig@suse.de>
#
interface="$1"
action="$2"
is_loopback() {
local type_path="/sys/class/net/$interface/type"
local interface_type=$(<"$type_path")
if [ -f "$type_path" ] && [ "$interface_type" -eq 772 ]; then
return 0
else
return 1
fi
}
case "$action" in
case "$2" in
up)
if ! is_loopback && test -x /usr/bin/systemctl && systemctl -q is-enabled autofs.service; then
systemctl --no-block reload autofs.service
if test -x /usr/bin/systemctl && systemctl -q is-enabled autofs.service; then
systemctl reload autofs.service
fi
;;
*)

View File

@@ -1,15 +1,3 @@
-------------------------------------------------------------------
Thu Sep 25 08:08:50 UTC 2025 - Jonathan Kang <songchuan.kang@suse.com>
- Modified NetworkManager-autofs: (bsc#1250091)
* don't reload autofs.service on loopback interface changes
* add --no-block option to request asynchronous behavior
-------------------------------------------------------------------
Wed Sep 24 09:31:24 UTC 2025 - Thorsten Kukuk <kukuk@suse.com>
- Drop rcautofs symlink [jsc#PED-266]
-------------------------------------------------------------------
Thu Sep 18 01:31:04 UTC 2025 - David Disseldorp <ddiss@suse.com>

View File

@@ -1,7 +1,7 @@
#
# spec file for package autofs
#
# Copyright (c) 2025 SUSE LLC and contributors
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,7 @@
#
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
@@ -129,6 +130,8 @@ SUSE_ASNEEDED=0
install -d -m 755 %{buildroot}%{_sysconfdir}/auto.master.d
install -D -m 644 %{SOURCE1} %{buildroot}%{_fillupdir}/sysconfig.autofs
install -D -m 755 %{SOURCE7} %{buildroot}%{_prefix}/lib/NetworkManager/dispatcher.d/autofs
ln -s %{_mandir}/man8/autofs.8.gz %{buildroot}/%{_mandir}/man8/rcautofs.8.gz
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcautofs
%if %{with_udisks}
install -D -m 644 %{SOURCE42} %{buildroot}%{_datadir}/dbus-1/system.d/org.freedesktop.AutoMount.conf
%endif
@@ -175,6 +178,7 @@ rm -f %{buildroot}%{_sysconfdir}/sysconfig/autofs
%{_mandir}/man5/*
%{_mandir}/man8/*
%{_sbindir}/automount
%{_sbindir}/rcautofs
%{_unitdir}/autofs.service
%changelog