Deleted Added
full compact
wr_fstab.c (82794) wr_fstab.c (119679)
1/*
1/*
2 * Copyright (c) 1997-2001 Erez Zadok
2 * Copyright (c) 1997-2003 Erez Zadok
3 * Copyright (c) 1989 Jan-Simon Pendry
4 * Copyright (c) 1989 Imperial College of Science, Technology & Medicine
5 * Copyright (c) 1989 The Regents of the University of California.
6 * All rights reserved.
7 *
8 * This code is derived from software contributed to Berkeley by
9 * Jan-Simon Pendry at Imperial College, London.
10 *

--- 22 unchanged lines hidden (view full) ---

33 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
34 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
35 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
36 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
37 * SUCH DAMAGE.
38 *
39 * %W% (Berkeley) %G%
40 *
3 * Copyright (c) 1989 Jan-Simon Pendry
4 * Copyright (c) 1989 Imperial College of Science, Technology & Medicine
5 * Copyright (c) 1989 The Regents of the University of California.
6 * All rights reserved.
7 *
8 * This code is derived from software contributed to Berkeley by
9 * Jan-Simon Pendry at Imperial College, London.
10 *

--- 22 unchanged lines hidden (view full) ---

33 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
34 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
35 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
36 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
37 * SUCH DAMAGE.
38 *
39 * %W% (Berkeley) %G%
40 *
41 * $Id: wr_fstab.c,v 1.3.2.1 2001/01/10 03:23:35 ezk Exp $
41 * $Id: wr_fstab.c,v 1.3.2.4 2003/07/18 04:50:20 ezk Exp $
42 *
43 */
44
45#ifdef HAVE_CONFIG_H
46# include <config.h>
47#endif /* HAVE_CONFIG_H */
48#include <am_defs.h>
49#include <fsi_data.h>

--- 271 unchanged lines hidden (view full) ---

321 if (hp->h_disk_fs || hp->h_mount) {
322 FILE *ef = pref_open(fstab_pref, hp->h_hostname, gen_hdr, hp->h_hostname);
323 if (ef) {
324 struct os_fstab_type *op = find_fstab_type(hp);
325 show_new(hp->h_hostname);
326 if (hp->h_disk_fs)
327 errors += write_dkfstab(ef, hp->h_disk_fs, op->op_fstab);
328 else
42 *
43 */
44
45#ifdef HAVE_CONFIG_H
46# include <config.h>
47#endif /* HAVE_CONFIG_H */
48#include <am_defs.h>
49#include <fsi_data.h>

--- 271 unchanged lines hidden (view full) ---

321 if (hp->h_disk_fs || hp->h_mount) {
322 FILE *ef = pref_open(fstab_pref, hp->h_hostname, gen_hdr, hp->h_hostname);
323 if (ef) {
324 struct os_fstab_type *op = find_fstab_type(hp);
325 show_new(hp->h_hostname);
326 if (hp->h_disk_fs)
327 errors += write_dkfstab(ef, hp->h_disk_fs, op->op_fstab);
328 else
329 log("No local disk mounts on %s", hp->h_hostname);
329 fsi_log("No local disk mounts on %s", hp->h_hostname);
330
331 if (hp->h_mount)
332 errors += write_dkrmount(ef, hp->h_mount, hp->h_hostname, op->op_mount);
333
334 pref_close(ef);
335 }
336 } else {
337 error("no disk mounts on %s", hp->h_hostname);
338 }
339 }
340 }
341 return errors;
342}
330
331 if (hp->h_mount)
332 errors += write_dkrmount(ef, hp->h_mount, hp->h_hostname, op->op_mount);
333
334 pref_close(ef);
335 }
336 } else {
337 error("no disk mounts on %s", hp->h_hostname);
338 }
339 }
340 }
341 return errors;
342}