diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-07-31 11:44:30 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-07-31 11:44:30 +0000 |
| commit | 4539a4b1613c47afea11a0cd76b29d992ab828eb (patch) | |
| tree | c07df713146aa022dc25b138699703dc555fb84e /usr/src/cmd/boot/bootadm/bootadm.c | |
| parent | 92d00144d1e2f01ebc15a0099c0a06a8210c7ccb (diff) | |
| parent | 7bbc5723436be52a39f5c04d60cc236082c52d5a (diff) | |
| download | illumos-joyent-4539a4b1613c47afea11a0cd76b29d992ab828eb.tar.gz | |
[illumos-gate merge]
commit 7bbc5723436be52a39f5c04d60cc236082c52d5a
6058 ipadm doesn't accept "ALL" as valid field name
commit 18961ad2c52f9d85e1f18c75f82d40639f483e1a
6087 bootadm message.h is hiding errors from lint
commit 50b1420592e389f7ad93528e20c703aff72dc15e
6088 Unable to enable the nfs/server service when nothing is shared
commit 1f183ba0b0be3e10202501aa3740753df6512804
5850 tcp timestamping behavior changed mid-connection
Diffstat (limited to 'usr/src/cmd/boot/bootadm/bootadm.c')
| -rw-r--r-- | usr/src/cmd/boot/bootadm/bootadm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/cmd/boot/bootadm/bootadm.c b/usr/src/cmd/boot/bootadm/bootadm.c index e948e7c34c..dfafc5f87f 100644 --- a/usr/src/cmd/boot/bootadm/bootadm.c +++ b/usr/src/cmd/boot/bootadm/bootadm.c @@ -2269,7 +2269,7 @@ is_valid_archive(char *root, int what) if (stat(timestamp_path, ×tamp) != 0 || sb.st_mtime > timestamp.st_mtime) { if (bam_verbose && !bam_check) - bam_print(UPDATE_CACHE_OLD, timestamp); + bam_print(UPDATE_CACHE_OLD); /* * Don't generate a false positive for the boot-archive service * but trigger an update of the archive cache in @@ -2688,7 +2688,7 @@ update_timestamp(char *root) */ if (creat(timestamp_path, FILE_STAT_MODE) < 0) { bam_error(OPEN_FAIL, timestamp_path, strerror(errno)); - bam_error(TIMESTAMP_FAIL, rootbuf); + bam_error(TIMESTAMP_FAIL); } } |