* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
#ifndef lint
static const char rcsid[] =
- "$Id: optr.c,v 1.34 2003/01/21 10:42:27 stelian Exp $";
+ "$Id: optr.c,v 1.37 2003/04/10 07:59:05 stelian Exp $";
#endif /* not lint */
#include <config.h>
quit("Cannot access %s\n", tabfs->mnt_fsname);
if (tabbuf.st_rdev == buf.st_rdev) {
free(new);
+ /* Copy passno and freq from /etc/fstab because
+ * /etc/mtab does always have them as 0 0 */
+ if (!tabfs->mnt_passno)
+ tabfs->mnt_passno = fs->mnt_passno;
+ if (!tabfs->mnt_freq)
+ tabfs->mnt_freq = fs->mnt_freq;
return NULL;
}
}
struct pfstab *pf;
struct pfstab *pfold = NULL;
FILE *mntfp;
- char *mnttables[] = { _PATH_MNTTAB, _PATH_MOUNTED, 0 };
+ char *mnttables[] = { _PATH_MOUNTED, _PATH_MNTTAB, 0 };
int i;
for (i = 0; mnttables[i]; i++) {