Mailinglist Archive: opensuse-commit (1262 mails)

Hello community,

here is the log from the commit of package autofs
checked in at Fri Sep 8 18:44:22 CEST 2006.

--------
--- autofs/autofs.changes 2006-09-01 16:56:08.000000000 +0200
+++ autofs/autofs.changes 2006-09-08 15:24:29.000000000 +0200
@@ -1,0 +2,11 @@
+Thu Sep 7 21:26:00 CEST 2006 - jeffm@xxxxxxxx
+
+- Added -multi option to enable consistent mount
+ behavior when using auto.net (118902)
+
+-------------------------------------------------------------------
+Tue Aug 29 15:22:32 CEST 2006 - jeffm@xxxxxxxx
+
+- Fixed --timeout=<num> handling (117672)
+
+-------------------------------------------------------------------

New:
----
autofs4-net-multi.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ autofs.spec ++++++
--- /var/tmp/diff_new_pack.ZZj8dT/_old 2006-09-08 18:44:04.000000000 +0200
+++ /var/tmp/diff_new_pack.ZZj8dT/_new 2006-09-08 18:44:04.000000000 +0200
@@ -19,7 +19,7 @@
Autoreqprov: on
Requires: sed grep
Version: 4.1.4
-Release: 28
+Release: 30
Summary: A Kernel-Based Automounter
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/autofs-%{version}.tar.bz2
@@ -37,6 +37,7 @@
Patch7: autofs-4.1.3-optflags.patch
Patch8: autofs-4.1.4-strip.patch
Patch9: autofs-4.1.4-configurable-locking.patch
+Patch10: autofs4-net-multi.patch
PreReq: %fillup_prereq %insserv_prereq
PreReq: /usr/bin/sed /usr/bin/grep /bin/mv

@@ -68,6 +69,7 @@
%patch7
%patch8
%patch9 -p1
+%patch10 -p1

%build
autoconf
@@ -129,6 +131,11 @@
/usr/sbin/automount

%changelog -n autofs
+* Thu Sep 07 2006 - jeffm@xxxxxxxx
+- Added -multi option to enable consistent mount
+ behavior when using auto.net (118902)
+* Tue Aug 29 2006 - jeffm@xxxxxxxx
+- Fixed --timeout=<num> handling (117672)
* Wed Aug 23 2006 - jeffm@xxxxxxxx
- Added configurable locking patch (178308)
* Fri May 26 2006 - schwab@xxxxxxx

++++++ autofs4-init.diff ++++++
--- /var/tmp/diff_new_pack.ZZj8dT/_old 2006-09-08 18:44:05.000000000 +0200
+++ /var/tmp/diff_new_pack.ZZj8dT/_new 2006-09-08 18:44:05.000000000 +0200
@@ -160,13 +160,13 @@
+ options=`echo "$options" | sed -e 's/$^\|[ \t]$-/\1/g'`
+ if echo $options | grep -- '-t' >/dev/null 2>&1 ; then
+ mountoptions="--timeout $(echo $options | \
-+ sed 's/^.*-t$imeout$*[ \t]*$[0-9][0-9]*$.*$/\2/g')"
++ sed 's/^.*-t$imeout$*[= \t]*$[0-9][0-9]*$.*$/\2/g')"
else
- map="$1"
+ mountoptions=""
+ fi
+ options=`echo "$options" | sed -e '
-+ s/--*t$imeout$*[ \t]*[0-9][0-9]*//g
++ s/--*t$imeout$*[= \t]*[0-9][0-9]*//g
+ s/$^\|[ \t]$-/\1/g'`
+ if [ -x $map ]; then
+ echo "$DAEMON $daemonoptions $mountoptions $dir program $map $options $localoptions"
@@ -209,18 +209,18 @@
- YPMAP=`catnismap auto.master`
- if [ -z "$YPMAP" ]; then
- catnismap
-+ if [ -x /usr/bin/ypcat ] && [ `ypcat -k auto.master 2>/dev/null | wc -l` -gt 0 ] ; then
++ if [ -x /usr/bin/ypcat ] && [ `ypcat -k $NISMASTERMAP 2>/dev/null | wc -l` -gt 0 ] ; then
+ # remove "/-" line used by direct mounts, which we don't yet understand
-+ ypcat -k auto.master | sed -e '/^\/-[ \t]/d' | (
++ ypcat -k $NISMASTERMAP | sed -e '/^\/-[ \t]/d' | (
+ while read dir map options ; do
+ if [ ! -z "$dir" -a ! -z "$map" -a x`echo "$map" | cut -c1` != 'x-' ] ; then
-+ map=`echo "$map" | sed -e 's/^auto_/auto./'`
++ [ "$UNDERSCORETODOT" = "yes" ] && map=`echo "$map" | sed -e 's/^auto_/auto./'`
+ if echo $options | grep -- '-t' >/dev/null 2>&1 ; then
+ mountoptions="--timeout $(echo $options | \
-+ sed 's/^.*-t$imeout$*[ \t]*$[0-9][0-9]*$.*$/\2/g')"
++ sed 's/^.*-t$imeout$*[= \t]*$[0-9][0-9]*$.*$/\2/g')"
+ fi
+ options=`echo "$options" | sed -e '
-+ s/--*t$imeout$*[ \t]*[0-9][0-9]*//g
++ s/--*t$imeout$*[= \t]*[0-9][0-9]*//g
+ s/$^\|[ \t]$-/\1/g'`
+ if [ -x $map ]; then
+ echo "$DAEMON $daemonoptions $mountoptions $dir program $map $options $localoptions"
@@ -263,7 +263,7 @@
+ if [ ! -z "$dir" -a ! -z "$map" -a x`echo "$map" | cut -c1` != 'x-' ] ; then
+ if echo $options | grep -- '-t' >/dev/null 2>&1 ; then
+ mountoptions="--timeout $(echo $options | \
-+ sed 's/^.*-t$imeout$*[ \t]*$[0-9][0-9]*$.*$/\2/g')"
++ sed 's/^.*-t$imeout$*[= \t]*$[0-9][0-9]*$.*$/\2/g')"
fi
- ;;
- nis)
@@ -272,7 +272,7 @@
- nisscheme=1
- export nisscheme
+ options=`echo "$options" | sed -e '
-+ s/--*t$imeout$*[ \t]*[0-9][0-9]*//g
++ s/--*t$imeout$*[= \t]*[0-9][0-9]*//g
+ s/$^\|[ \t]$-/\1/g'`
+ if [ -x $map ]; then
+ echo "$DAEMON $daemonoptions $mountoptions $dir program $map $options $localoptions"
@@ -858,8 +858,8 @@
+ expire)
+ echo -n "Trigger expire for autofs: "
+ if checkproc $DAEMON ; then
-+ # send HUP to daemons
-+ killproc -HUP $DAEMON || return=1
++ # send USR1 to daemons
++ killproc -USR1 $DAEMON || return=1
fi
-
- # Check that maps exist

++++++ autofs4-net-multi.patch ++++++
diff -rup autofs-4.1.4/modules/parse_sun.c autofs-4.1.4.devel/modules/parse_sun.c
--- autofs-4.1.4/modules/parse_sun.c 2006-09-07 15:14:34.000000000 -0400
+++ autofs-4.1.4.devel/modules/parse_sun.c 2006-09-07 15:14:12.000000000 -0400
@@ -632,6 +632,9 @@ static int sun_mount(const char *root, c
nonstrict = 0;
} else if (strncmp("nonstrict", cp, 9) == 0) {
nonstrict = 1;
+ } else if (strncmp("forcemulti", cp, 10) == 0) {
+ ; /* just strip the string out,
+ * it's handled earlier */
} else {
memcpy(np, cp, comma - cp + 1);
np += comma - cp + 1;
@@ -847,6 +855,7 @@ int parse_mount(const char *root, const
const char *p;
int mapent_len, rv;
int optlen;
+ int force_multi = 0;

mapent_len = expandsunent(mapent, NULL, name, ctxt->subst, ctxt->slashify_colons);
pmapent = alloca(mapent_len + 1);
@@ -875,6 +884,8 @@ int parse_mount(const char *root, const
char *noptions = NULL;

p = parse_options(p, &noptions);
+ if (options && strcmp(options, "multi") == 0)
+ force_multi = 1;
options = concat_options(options, noptions);

if (options == NULL) {
@@ -887,7 +898,7 @@ int parse_mount(const char *root, const

debug(MODPREFIX "gathered options: %s", options);

- if (check_is_multi(p)) {
+ if (force_multi || check_is_multi(p)) {
struct multi_mnt *list, *head = NULL;
char *multi_root;
int l;
diff -rup autofs-4.1.4/man/autofs.5 autofs-4.1.4.devel/man/autofs.5
--- autofs-4.1.4/man/autofs.5 2004-05-18 08:22:40.000000000 -0400
+++ autofs-4.1.4.devel/man/autofs.5 2006-09-07 15:20:09.000000000 -0400
@@ -51,6 +51,12 @@ is used to treat errors when mounting fi
multiple file systems should be mounted (`multimounts'). If this option
is given, no file system is mounted at all if at least one file system
can't be mounted.
+.I -multi
+is used to specify that even if there is only one file system in this mapping,
+it should be treated as a multi-mount. This is useful for auto.net, which
+lists all file systems exported from a particular host. Without this option,
+the mount would contain the contents of a lone export rather than the name
+of the export as might be expected.

.SS location
The location specifies from where the file system is to be mounted. In the
diff -ruN autofs-4.1.4/samples/auto.net autofs-4.1.4.devel/samples/auto.net
--- autofs-4.1.4/samples/auto.net 2006-09-07 15:51:07.000000000 -0400
+++ autofs-4.1.4.devel/samples/auto.net 2006-09-07 15:49:39.000000000 -0400
@@ -9,9 +9,8 @@

key="$1"

-# add "nosymlink" here if you want to suppress symlinking local filesystems
-# add "nonstrict" to make it OK for some filesystems to not mount
-opts="-fstype=nfs,hard,intr,nodev,nosuid"
+. /etc/sysconfig/autofs
+opts="$AUTO_NET_FLAGS -fstype=nfs,hard,intr,nodev,nosuid"

# Showmount comes in a number of names and varieties. "showmount" is
# typically an older version which accepts the '--no-headers' flag

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous

Next >

Mailinglist Archive: opensuse-commit (1262 mails)

commit autofs

Search this list

List Navigation

This Thread