Print this page
NEX-13374 NDMP should be able to backup unmounted ZFS filesystems
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
NEX-9532 NDMP: readdir errors when file/directory has special characters
Reviewed by: Peer Dampmann <peer.dampmann@nexenta.com>
Reviewed by: Alexander Eremin <alexander.eremin@nexenta.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
NEX-5801 Snapshots left over after failed backups
Reviewed by: Rick Mesta <rick.mesta@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Revert "NEX-5801 Snapshots left over after failed backups"
This reverts commit f182fb95f09036db71fbfc6f0a6b90469b761f21.
NEX-5801 Snapshots left over after failed backups
Reviewed by: Rick Mesta <rick.mesta@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
NEX-3000 ndmp IPS package is broken
Reviewed by: Dan Fields <dan.fields@nexenta.com>
Reviewed by: Saso Kiselkov <saso.kiselkov@nexenta.com>
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
Reviewed by: Marcel Telka <marcel.telka@nexenta.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
NEX-2911 NDMP logging should use syslog and is too chatty (build noise)
NEX-2911 NDMP logging should use syslog and is too chatty
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/cmd/ndmpd/Makefile
+++ new/usr/src/cmd/ndmpd/Makefile
1 1 #
2 2 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
3 3 #
4 +# Copyright 2017 Nexenta Systems, Inc. All rights reserved.
5 +#
4 6
5 7 #
6 8 # BSD 3 Clause License
7 9 #
8 10 # Copyright (c) 2007, The Storage Networking Industry Association.
9 11 #
10 12 # Redistribution and use in source and binary forms, with or without
11 13 # modification, are permitted provided that the following conditions
12 14 # are met:
13 15 # - Redistributions of source code must retain the above copyright
14 16 # notice, this list of conditions and the following disclaimer.
15 17 #
16 18 # - Redistributions in binary form must reproduce the above copyright
17 19 # notice, this list of conditions and the following disclaimer in
18 20 # the documentation and/or other materials provided with the
19 21 # distribution.
20 22 #
21 23 # - Neither the name of The Storage Networking Industry Association (SNIA)
22 24 # nor the names of its contributors may be used to endorse or promote
23 25 # products derived from this software without specific prior written
24 26 # permission.
25 27 #
26 28 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
27 29 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
28 30 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
29 31 # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
30 32 # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
31 33 # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
32 34 # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
33 35 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
34 36 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
35 37 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
36 38 # POSSIBILITY OF SUCH DAMAGE.
37 39 #
38 40 PROG = ndmpd
39 41
40 42 include $(SRC)/cmd/Makefile.cmd
41 43
42 44 NDMP_DIR = ndmp
43 45 TLM_DIR = tlm
44 46
45 47 include $(NDMP_DIR)/Makefile.rpcgen
46 48
47 49 CFLAGS += $(CCVERBOSE)
48 50
49 51 CPPFLAGS += $(LFLAGS64)
50 52
51 53 CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DDEBUG
52 54 CPPFLAGS += -I. -Iinclude
53 55
54 56 CSTD = $(CSTD_GNU99)
55 57
56 58 # lint does not like unused _umem_*_init
57 59 LINTFLAGS += -xerroff=E_NAME_DEF_NOT_USED2
58 60
|
↓ open down ↓ |
45 lines elided |
↑ open up ↑ |
59 61 # function argument declared inconsistently
60 62 LINTFLAGS += -xerroff=E_INCONS_ARG_DECL2
61 63 # value type used inconsistently
62 64 LINTFLAGS += -xerroff=E_INCONS_VAL_TYPE_USED2
63 65 # value type declared inconsistently
64 66 LINTFLAGS += -xerroff=E_INCONS_VAL_TYPE_DECL2
65 67 # argument used inconsistently
66 68 LINTFLAGS += -xerroff=E_INCONS_ARG_USED2
67 69
68 70 CERRWARN += -_gcc=-Wno-unused-variable
69 -CERRWARN += -_gcc=-Wno-switch
70 -CERRWARN += -_gcc=-Wno-uninitialized
71 -CERRWARN += -_gcc=-Wno-address
72 71
73 -LDLIBS += -lsocket -lnsl -lzfs -lsec -lndmp -lmd5 -lnvpair -lumem -lbsm -lgen -lcmdutils -linetutil
72 +LDLIBS += -lsocket -lnsl -lzfs -lsec -lndmp -lmd5 -lnvpair -lumem -lbsm -lcmdutils -linetutil
74 73
75 74 OBJS= \
76 75 $(NDMP_DIR)/ndmp_xdr.o \
77 76 $(NDMP_OBJ:%.o=$(NDMP_DIR)/%.o) $(TLM_OBJ:%.o=$(TLM_DIR)/%.o)
78 77
79 78 NDMP_OBJ = \
80 79 ndmpd_callbacks.o \
81 80 ndmpd_chkpnt.o \
81 + ndmpd_clone.o \
82 82 ndmpd_comm.o \
83 83 ndmpd_config.o \
84 84 ndmpd_connect.o \
85 85 ndmpd_data.o \
86 86 ndmpd_door.o \
87 87 ndmpd_dtime.o \
88 88 ndmpd_fhistory.o \
89 89 ndmpd_handler.o \
90 - ndmpd_log.o \
91 90 ndmpd_main.o \
92 91 ndmpd_mark.o \
93 92 ndmpd_mover.o \
94 93 ndmpd_prop.o \
95 94 ndmpd_scsi.o \
96 95 ndmpd_tape.o \
97 96 ndmpd_tar.o \
98 97 ndmpd_tar3.o \
99 - ndmpd_util.o \
100 - ndmpd_zfs.o
98 + ndmpd_util.o
101 99
102 100 TLM_OBJ = \
103 101 tlm_backup_reader.o \
104 102 tlm_bitmap.o \
105 103 tlm_buffers.o \
106 104 tlm_info.o \
107 105 tlm_init.o \
108 106 tlm_lib.o \
109 107 tlm_restore_writer.o \
110 108 tlm_traverse.o \
111 109 tlm_util.o \
112 110 tlm_hardlink.o
|
↓ open down ↓ |
2 lines elided |
↑ open up ↑ |
113 111
114 112 SRCS= $(NDMP_OBJ:%.o=$(NDMP_DIR)/%.c) $(TLM_OBJ:%.o=$(TLM_DIR)/%.c)
115 113
116 114 SVCMETHOD = svc-ndmp
117 115 $(ROOTSVCMETHOD) := FILEMODE = 0555
118 116
119 117 MANIFEST = ndmp.xml
120 118 ROOTMANIFESTDIR= $(ROOTSVCSYSTEM)
121 119 $(ROOTMANIFEST) := FILEMODE = 444
122 120
123 -ROOTNDMPDDIR= $(ROOTLIB)/ndmp
121 +ROOTNDMPDDIR = $(ROOTLIB)/ndmp
122 +LOGNDMPDDIR = $(ROOT)/var/log/ndmp
124 123 ROOTNDMPDFILE = $(PROG:%=$(ROOTNDMPDDIR)/%)
125 124
126 125 FILEMODE = 0444
127 126 $(ROOTNDMPDFILE):= FILEMODE = 0555
128 127
128 +$(LOGNDMPDDIR):
129 + $(INS.dir)
130 +
129 131 $(ROOTNDMPDDIR):
130 132 $(INS.dir)
131 133
132 134 $(ROOTNDMPDDIR)/%: %
133 135 $(INS.file)
134 136
135 137 .KEEP_STATE:
136 138
137 139 all: $(PROG)
138 140
139 -install: all $(ROOTNDMPDDIR) $(ROOTNDMPDFILE) $(ROOTSVCMETHOD) $(ROOTMANIFEST)
141 +install: all $(ROOTNDMPDDIR) $(LOGNDMPDDIR) $(ROOTNDMPDFILE) $(ROOTSVCMETHOD) \
142 + $(ROOTMANIFEST)
140 143
141 144 check: $(CHKMANIFEST)
142 145
143 146 clobber:
144 147
145 148 $(PROG) : $(OBJS)
146 149 $(LINK.c) -o $@ $(OBJS) $(LDLIBS)
147 150 $(POST_PROCESS)
148 151
149 152 $(NDMP_DIR)/%.o : $(NDMP_DIR)/%.c
150 153 $(COMPILE.c) -o $@ $<
151 154
152 155 $(TLM_DIR)/%.o : $(TLM_DIR)/%.c
153 156 $(COMPILE.c) -o $@ $<
154 157
155 158 lint: lint_SRCS
156 159
157 160 clean: rpcclean
158 161 rm -f $(NDMP_DIR)/*.o $(TLM_DIR)/*.o
159 162
160 163 include $(SRC)/cmd/Makefile.targ
|
↓ open down ↓ |
11 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX