BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.sbin / amd / amd / restart.c

diff --git a/usr/src/usr.sbin/amd/amd/restart.c b/usr/src/usr.sbin/amd/amd/restart.c
index c4de18a..e08287f 100644 (file)
--- a/usr/src/usr.sbin/amd/amd/restart.c
+++ b/usr/src/usr.sbin/amd/amd/restart.c
@@ -1,6 +1,4 @@
 /*
 /*

- * $Id: restart.c,v 5.2 90/06/23 22:19:55 jsp Rel $
- *

  * Copyright (c) 1990 Jan-Simon Pendry
  * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
  * Copyright (c) 1990 The Regents of the University of California.
  * Copyright (c) 1990 Jan-Simon Pendry
  * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
  * Copyright (c) 1990 The Regents of the University of California.


@@ -9,21 +7,38 @@
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry at Imperial College, London.
  *
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry at Imperial College, London.
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 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
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)restart.c   5.3 (Berkeley) 5/12/91
+ *
+ * $Id: restart.c,v 5.2.1.3 91/05/07 22:18:29 jsp Alpha $

  *
  *

- *     @(#)restart.c   5.1 (Berkeley) 6/29/90

  */
 
 #include "am.h"
  */
 
 #include "am.h"


@@ -115,20 +130,22 @@ void restart()
                                me->mnt_fsname = str3cat(me->mnt_fsname, mo.opt_rhost, ":", "/");
                        }
                        mo.opt_fs = me->mnt_dir;
                                me->mnt_fsname = str3cat(me->mnt_fsname, mo.opt_rhost, ":", "/");
                        }
                        mo.opt_fs = me->mnt_dir;

+                       mo.opt_opts = me->mnt_opts;

 
                        /*
                         * Make a new mounted filesystem
                         */
                        mf = find_mntfs(fs_ops, &mo, me->mnt_dir,
 
                        /*
                         * Make a new mounted filesystem
                         */
                        mf = find_mntfs(fs_ops, &mo, me->mnt_dir,

-                               me->mnt_fsname, me->mnt_opts);
+                               me->mnt_fsname, "", me->mnt_opts);

                        if (mf->mf_refc == 1) {
                                mf->mf_flags |= MFF_RESTART|MFF_MOUNTED;
                                mf->mf_error = 0;       /* Already mounted correctly */
                        if (mf->mf_refc == 1) {
                                mf->mf_flags |= MFF_RESTART|MFF_MOUNTED;
                                mf->mf_error = 0;       /* Already mounted correctly */

+                               mf->mf_fo = 0;

                                /*
                                 * If the restarted type is a link then
                                 * don't time out.
                                 */
                                /*
                                 * If the restarted type is a link then
                                 * don't time out.
                                 */

-                               if (fs_ops == &sfs_ops)
+                               if (fs_ops == &sfs_ops || fs_ops == &ufs_ops)

                                        mf->mf_flags |= MFF_RSTKEEP;
                                if (fs_ops->fs_init) {
                                        /*
                                        mf->mf_flags |= MFF_RSTKEEP;
                                if (fs_ops->fs_init) {
                                        /*