From da165852d21a48465dccd88e6c4216e27d37486e Mon Sep 17 00:00:00 2001
From: Johann Latocha
Date: Thu, 16 Feb 2012 14:14:41 +0100
Subject: [BUILD] Don't overwrite existing config files

---
 CMakeLists.txt            |  2 +-
 dnbd3-client.conf         | 29 -----------------------------
 dnbd3-client.conf.example | 29 +++++++++++++++++++++++++++++
 dnbd3-server.conf         | 25 -------------------------
 dnbd3-server.conf.example | 25 +++++++++++++++++++++++++
 src/server/net.c          |  2 +-
 6 files changed, 56 insertions(+), 56 deletions(-)
 delete mode 100644 dnbd3-client.conf
 create mode 100644 dnbd3-client.conf.example
 delete mode 100644 dnbd3-server.conf
 create mode 100644 dnbd3-server.conf.example

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
deleted file mode 100644
index 1b0ccbd..0000000
--- a/dnbd3-client.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-# This is a sample configuration file for dnbd3-client
-
-[Ubuntu 10.04]
-server=132.230.4.29
-port=5003
-vid=1
-rid=3
-device=/dev/dnbd0
-
-[Ubuntu 10.10]
-server=132.230.4.29
-port=5003
-vid=2
-rid=1
-device=/dev/dnbd1
-
-[Ubuntu 11.04]
-server=132.230.4.29
-port=5003
-vid=3
-rid=1
-device=/dev/dnbd2
-
-[Ubuntu 11.10]
-server=132.230.4.29
-port=5003
-vid=4
-rid=1
-device=/dev/dnbd3
diff --git a/dnbd3-client.conf.example b/dnbd3-client.conf.example
new file mode 100644
index 0000000..1b0ccbd
--- /dev/null
+++ b/dnbd3-client.conf.example
@@ -0,0 +1,29 @@
+# This is a sample configuration file for dnbd3-client
+
+[Ubuntu 10.04]
+server=132.230.4.29
+port=5003
+vid=1
+rid=3
+device=/dev/dnbd0
+
+[Ubuntu 10.10]
+server=132.230.4.29
+port=5003
+vid=2
+rid=1
+device=/dev/dnbd1
+
+[Ubuntu 11.04]
+server=132.230.4.29
+port=5003
+vid=3
+rid=1
+device=/dev/dnbd2
+
+[Ubuntu 11.10]
+server=132.230.4.29
+port=5003
+vid=4
+rid=1
+device=/dev/dnbd3
diff --git a/dnbd3-server.conf b/dnbd3-server.conf
deleted file mode 100644
index 0169bc2..0000000
--- a/dnbd3-server.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# This is a sample configuration file for dnbd3-server
-
-[Ubuntu 10.04]
-file=/home/jjl/Data/ISOs/Ubuntu/ubuntu-10.04.3-desktop-i386.iso
-servers=132.230.4.29;132.230.4.220
-vid=1
-rid=3
-
-[Ubuntu 10.10]
-file=/home/jjl/Data/ISOs/Ubuntu/ubuntu-10.10-desktop-i386.iso
-servers=132.230.4.29;132.230.4.220
-vid=2
-rid=1
-
-[Ubuntu 11.04]
-file=/home/jjl/Data/ISOs/Ubuntu/ubuntu-11.04-desktop-i386.iso
-servers=132.230.4.29;132.230.4.220
-vid=3
-rid=1
-
-[Ubuntu 11.10]
-file=/home/jjl/Data/ISOs/Ubuntu/ubuntu-11.10-desktop-i386.iso
-servers=132.230.4.29;132.230.4.220
-vid=4
-rid=1
diff --git a/dnbd3-server.conf.example b/dnbd3-server.conf.example
new file mode 100644
index 0000000..0169bc2
--- /dev/null
+++ b/dnbd3-server.conf.example
@@ -0,0 +1,25 @@
+# This is a sample configuration file for dnbd3-server
+
+[Ubuntu 10.04]
+file=/home/jjl/Data/ISOs/Ubuntu/ubuntu-10.04.3-desktop-i386.iso
+servers=132.230.4.29;132.230.4.220
+vid=1
+rid=3
+
+[Ubuntu 10.10]
+file=/home/jjl/Data/ISOs/Ubuntu/ubuntu-10.10-desktop-i386.iso
+servers=132.230.4.29;132.230.4.220
+vid=2
+rid=1
+
+[Ubuntu 11.04]
+file=/home/jjl/Data/ISOs/Ubuntu/ubuntu-11.04-desktop-i386.iso
+servers=132.230.4.29;132.230.4.220
+vid=3
+rid=1
+
+[Ubuntu 11.10]
+file=/home/jjl/Data/ISOs/Ubuntu/ubuntu-11.10-desktop-i386.iso
+servers=132.230.4.29;132.230.4.220
+vid=4
+rid=1
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;
 
-- 
cgit v1.2.3-55-g7522