| zfs.c (d1f855d73e0bf529109aa3dc1b967fc6ac19b4fc) | zfs.c (c75cc341903ca38e644edfae5357a4020418f9be) |
|---|---|
| 1/* 2 * CDDL HEADER START 3 * 4 * The contents of this file are subject to the terms of the 5 * Common Development and Distribution License (the "License"). 6 * You may not use this file except in compliance with the License. 7 * 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE --- 192 unchanged lines hidden (view full) --- 201{ 202 int status; 203 204 /* No brand-specific handler */ 205 if (presnapbuf[0] == '\0') 206 return (Z_OK); 207 208 /* Run the hook */ | 1/* 2 * CDDL HEADER START 3 * 4 * The contents of this file are subject to the terms of the 5 * Common Development and Distribution License (the "License"). 6 * You may not use this file except in compliance with the License. 7 * 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE --- 192 unchanged lines hidden (view full) --- 201{ 202 int status; 203 204 /* No brand-specific handler */ 205 if (presnapbuf[0] == '\0') 206 return (Z_OK); 207 208 /* Run the hook */ |
| 209 status = do_subproc_interactive(presnapbuf); | 209 status = do_subproc(presnapbuf); |
| 210 if ((status = subproc_status(gettext("brand-specific presnapshot"), 211 status, B_FALSE)) != ZONE_SUBPROC_OK) 212 return (Z_ERR); 213 214 return (Z_OK); 215} 216 217/* --- 4 unchanged lines hidden (view full) --- 222{ 223 int status; 224 225 /* No brand-specific handler */ 226 if (postsnapbuf[0] == '\0') 227 return (Z_OK); 228 229 /* Run the hook */ | 210 if ((status = subproc_status(gettext("brand-specific presnapshot"), 211 status, B_FALSE)) != ZONE_SUBPROC_OK) 212 return (Z_ERR); 213 214 return (Z_OK); 215} 216 217/* --- 4 unchanged lines hidden (view full) --- 222{ 223 int status; 224 225 /* No brand-specific handler */ 226 if (postsnapbuf[0] == '\0') 227 return (Z_OK); 228 229 /* Run the hook */ |
| 230 status = do_subproc_interactive(postsnapbuf); | 230 status = do_subproc(postsnapbuf); |
| 231 if ((status = subproc_status(gettext("brand-specific postsnapshot"), 232 status, B_FALSE)) != ZONE_SUBPROC_OK) 233 return (Z_ERR); 234 235 return (Z_OK); 236} 237 238/* --- 89 unchanged lines hidden (view full) --- 328 /* pass args - snapshot_name & snap_path */ 329 if (snprintf(cmdbuf, sizeof (cmdbuf), "%s %s %s", validsnapbuf, 330 snapshot_name, snap_path) >= sizeof (cmdbuf)) { 331 zerror("Command line too long"); 332 return (Z_ERR); 333 } 334 335 /* Run the hook */ | 231 if ((status = subproc_status(gettext("brand-specific postsnapshot"), 232 status, B_FALSE)) != ZONE_SUBPROC_OK) 233 return (Z_ERR); 234 235 return (Z_OK); 236} 237 238/* --- 89 unchanged lines hidden (view full) --- 328 /* pass args - snapshot_name & snap_path */ 329 if (snprintf(cmdbuf, sizeof (cmdbuf), "%s %s %s", validsnapbuf, 330 snapshot_name, snap_path) >= sizeof (cmdbuf)) { 331 zerror("Command line too long"); 332 return (Z_ERR); 333 } 334 335 /* Run the hook */ |
| 336 status = do_subproc_interactive(cmdbuf); | 336 status = do_subproc(cmdbuf); |
| 337 if ((status = subproc_status(gettext("brand-specific validatesnapshot"), 338 status, B_FALSE)) != ZONE_SUBPROC_OK) 339 return (Z_ERR); 340 341 return (Z_OK); 342} 343 344/* --- 678 unchanged lines hidden --- | 337 if ((status = subproc_status(gettext("brand-specific validatesnapshot"), 338 status, B_FALSE)) != ZONE_SUBPROC_OK) 339 return (Z_ERR); 340 341 return (Z_OK); 342} 343 344/* --- 678 unchanged lines hidden --- |