diff options
| author | Johann Latocha | 2012-02-16 14:14:41 +0100 |
|---|---|---|
| committer | Johann Latocha | 2012-02-16 14:14:41 +0100 |
| commit | da165852d21a48465dccd88e6c4216e27d37486e (patch) | |
| tree | 88ef18fe48e905bab125c437abedfe55b6621060 | |
| parent | [SERVER] Minor bug fixes (diff) | |
| download | dnbd3-da165852d21a48465dccd88e6c4216e27d37486e.tar.gz dnbd3-da165852d21a48465dccd88e6c4216e27d37486e.tar.xz dnbd3-da165852d21a48465dccd88e6c4216e27d37486e.zip | |
[BUILD] Don't overwrite existing config files
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | dnbd3-client.conf.example (renamed from dnbd3-client.conf) | 0 | ||||
| -rw-r--r-- | dnbd3-server.conf.example (renamed from dnbd3-server.conf) | 0 | ||||
| -rw-r--r-- | src/server/net.c | 2 |
4 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d6e74f0..92a60d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,7 +83,7 @@ ADD_CUSTOM_TARGET(${MODULE_NAME} ALL DEPENDS ${CMAKE_BINARY_DIR}/${MODULE_FILE}) INSTALL(TARGETS dnbd3-server dnbd3-client RUNTIME DESTINATION sbin) -INSTALL(FILES dnbd3-server.conf dnbd3-client.conf DESTINATION /etc/) +INSTALL(FILES dnbd3-server.conf.example dnbd3-client.conf.example DESTINATION /etc/) INSTALL(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.ko DESTINATION /lib/modules/${CMAKE_SYSTEM_VERSION}/kernel/drivers/block diff --git a/dnbd3-client.conf b/dnbd3-client.conf.example index 1b0ccbd..1b0ccbd 100644 --- a/dnbd3-client.conf +++ b/dnbd3-client.conf.example diff --git a/dnbd3-server.conf b/dnbd3-server.conf.example index 0169bc2..0169bc2 100644 --- a/dnbd3-server.conf +++ b/dnbd3-server.conf.example diff --git a/src/server/net.c b/src/server/net.c index 9db16f2..af521b9 100644 --- a/src/server/net.c +++ b/src/server/net.c @@ -110,7 +110,7 @@ void *dnbd3_handle_query(void *dnbd3_client) if (sendfile(client->sock, image_file, (off_t *) &request.offset, request.size) < 0) printf("ERROR: sendfile returned -1\n"); - image->atime = time(NULL); + image->atime = time(NULL); // TODO: check if mutex is needed continue; |