Hello community, here is the log from the commit of package autofs for openSUSE:Factory checked in at Tue May 31 17:37:20 CEST 2011. -------- --- autofs/autofs.changes 2011-05-09 18:45:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/autofs/autofs.changes 2011-05-27 22:55:48.000000000 +0200 @@ -1,0 +2,24 @@ +Fri May 27 20:53:03 UTC 2011 - lchiquitto@novell.com + +- modify the NetworkManager dispatcher script to prevent it from + restarting AutoFS when the network goes down (bnc#693402) + +------------------------------------------------------------------- +Fri May 27 20:13:52 UTC 2011 - lchiquitto@novell.com + +- init script: remove references to the obsolete autofs.ko (v3) + kernel module (bnc#696708) +- init script: don't wait one second if the misc device is already + available (bnc#696708) + +------------------------------------------------------------------- +Mon May 23 17:44:54 UTC 2011 - lchiquitto@novell.com + +- documentation: add the following (commented out) options to + the default sysconfig file (bnc#695487, bnc#691617): + * DEFAULT_NEGATIVE_TIMEOUT + * DEFAULT_MOUNT_WAIT and DEFAULT_UMOUNT_WAIT + * MOUNT_NFS_DEFAULT_PROTOCOL + * LDAP_URI, LDAP_TIMEOUT, LDAP_NETWORK_TIMEOUT and SEARCH_BASE + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autofs.spec ++++++ --- /var/tmp/diff_new_pack.lG9sjK/_old 2011-05-31 17:34:34.000000000 +0200 +++ /var/tmp/diff_new_pack.lG9sjK/_new 2011-05-31 17:34:34.000000000 +0200 @@ -26,7 +26,7 @@ Group: System/Daemons AutoReqProv: on Version: 5.0.5 -Release: 22 +Release: 24 Summary: A Kernel-Based Automounter BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}.tar.bz2 ++++++ NetworkManager-autofs ++++++ --- /var/tmp/diff_new_pack.lG9sjK/_old 2011-05-31 17:34:34.000000000 +0200 +++ /var/tmp/diff_new_pack.lG9sjK/_new 2011-05-31 17:34:34.000000000 +0200 @@ -10,9 +10,6 @@ up) rc_active autofs && /etc/init.d/autofs restart ;; - down) - rc_active autofs && /etc/init.d/autofs restart - ;; *) exit 0 ;; ++++++ autofs.init ++++++ --- /var/tmp/diff_new_pack.lG9sjK/_old 2011-05-31 17:34:34.000000000 +0200 +++ /var/tmp/diff_new_pack.lG9sjK/_new 2011-05-31 17:34:34.000000000 +0200 @@ -62,17 +62,14 @@ echo "Error: failed to load $MODULE module." return 1 fi - elif ([ -f /proc/modules ] && lsmod) | grep -q autofs[^4]; then - # Wrong autofs filesystem module loaded - echo - echo "Error: autofs kernel module is loaded, $MODULE required" - return 1 fi # Use the AutoFS misc device unless it is explicitly disabled if [ -z "$USE_MISC_DEVICE" -o "x$USE_MISC_DEVICE" = "xyes" ]; then - sleep 1 if [ -e "/proc/misc" ]; then + if ! grep -q autofs /proc/misc; then + sleep 1 + fi MINOR=`awk "/$DEVICE/ {print \\$1}" /proc/misc` if [ -n "$MINOR" -a ! -c "/dev/$DEVICE" ]; then mknod -m 0600 /dev/$DEVICE c 10 $MINOR ++++++ sysconfig.autofs ++++++ --- /var/tmp/diff_new_pack.lG9sjK/_old 2011-05-31 17:34:35.000000000 +0200 +++ /var/tmp/diff_new_pack.lG9sjK/_new 2011-05-31 17:34:35.000000000 +0200 @@ -6,15 +6,15 @@ # AUTOFS_OPTIONS="" -## Description: default mount options. +## Description: Default mount options. ## Type: string ## Default: "" # -# default mount options which are appended or replaced to -# each map entry (see also APPEND_OPTIONS) +# Default mount options which are appended or replaced to +# each map entry (see also APPEND_OPTIONS). LOCAL_OPTIONS="" -## Description: append or replace options +## Description: Append or replace options. ## Type: string ## Default: "yes" # @@ -23,12 +23,12 @@ # (program default "yes", append options). APPEND_OPTIONS="yes" -## Description: use autofs miscellaneous device +## Description: Use AutoFS miscellaneous device (/dev/autofs). ## Type: string ## Default: "yes" # -# Determine whether the autofs misc device (/dev/autofs) will be used -# for routing ioctl commands. Requires kernel support (2.6.28 and newer) +# Determine whether the AutoFS misc device (/dev/autofs) will be used +# for routing ioctl commands. Requires kernel support (2.6.28 and newer). USE_MISC_DEVICE="yes" ## Description: Default map name for the master map. @@ -37,12 +37,44 @@ # DEFAULT_MASTER_MAP_NAME="auto.master" -## Description: Set the default mount timeout (default 600). +## Description: Set the default mount timeout. ## Type: integer(0:) ## Default: 600 # DEFAULT_TIMEOUT=600 +## Description: Set the default negative timeout for failed mount attempts. +## Type: integer(0:) +## Default: 60 +# +#DEFAULT_NEGATIVE_TIMEOUT=60 + +## Description: Time to wait for a response from mount(8). +## Type: integer(-1:) +## Default: -1 +# +# Setting this timeout can cause problems when mount would otherwise +# wait for a server that is temporarily unavailable, such as when +# it's restarting. The default of waiting for mount(8) usually +# results in a wait of around 3 minutes. +#DEFAULT_MOUNT_WAIT=-1 + +## Description: Time to wait for a response from umount(8). +## Type: integer(0:) +## Default: 12 +# +#DEFAULT_UMOUNT_WAIT=12 + +## Description: The default protocol used by mount.nfs(8). +## Type: string +## Default: 3 +# +# Since we can't identify the default automatically we need to +# set it in our configuration. This will only make a difference +# for replicated map entries as availability probing isn't +# used for single host map entries. +#MOUNT_NFS_DEFAULT_PROTOCOL=3 + ## Description: maps are browsable by default. ## Type: string ## Default: "yes" @@ -83,13 +115,50 @@ #DEFAULT_ENTRY_ATTRIBUTE="automountKey" #DEFAULT_VALUE_ATTRIBUTE="automountInformation" -## Description: set the default location for the SASL authentication configuration file. +## Description: Set the default location for the SASL authentication configuration file. ## Type: string ## Default: "/etc/autofs_ldap_auth.conf" # DEFAULT_AUTH_CONF_FILE="etc/autofs_ldap_auth.conf" -## Description: set the map cache hash table size. +## Description: List of LDAP server URIs. +## Type: string +## Default: "" +# +# Space seperated list of server URIs of the form <proto>://<server>[/] +# where <proto> can be ldap or ldaps. The option can be given multiple +# times. Map entries that include a server name override this option. +# +# This configuration option can also be used to request AutoFS lookup +# SRV RRs for a domain of the form <proto>:///[<domain dn>]. Note that a +# trailing "/" is not allowed when using this form. If the domain dn +# is not specified the DNS domain name (if any) is used to construct +# the domain dn for the SRV RR lookup. The server list returned from +# an SRV RR lookup is refreshed according to the minimum ttl found in +# the SRV RR records or after one hour, whichever is less. +#LDAP_URI="" + +## Description: Timeout value for the synchronous LDAP API calls. +## Type: integer +## Default: LDAP library default +# +#LDAP_TIMEOUT=-1 + +## Description: Set the network LDAP response timeout (default 8). +## Type: integer +## Default: 8 +# +#LDAP_NETWORK_TIMEOUT=8 + +## Description: Define the LDAP base dn for map dn lookup. +## Type: string +## Default: "" +# +# Multiple entries can be given and they are checked in the order +# they appear here. +#SEARCH_BASE="" + +## Description: Set the map cache hash table size. ## Type: integer ## Default: 1024 # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org