Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 ocfs2-tools (1.6.4-2ubuntu2) precise; urgency=low
 .
   * Changed services to new names
Author: David Montalva Furio <montalva_dav@gva.es>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- ocfs2-tools-1.6.4.orig/lliurex-install/usr/sbin/llxcfg-cluster
+++ ocfs2-tools-1.6.4/lliurex-install/usr/sbin/llxcfg-cluster
@@ -21,8 +21,11 @@ exit 0
 
 [ "$(id -u)" != "0" ] && exit 0
 
+OCFS2_MOUNT_FSTAB="/ocfs2"
+OCFS2_NET_EXPORT_DIRS="/net/mirror /net/server-sync"
+OCFS2_DISK="/dev/sdb"
 
-eval $(n4d-vars getvalues OCFS2_EXPORT_DIRS OCFS2_MOUNT_FSTAB OCFS2_DISK)
+#eval $(n4d-vars getvalues OCFS2_EXPORT_DIRS OCFS2_MOUNT_FSTAB OCFS2_DISK)
 
 
 case $1 in
@@ -53,19 +56,19 @@ case $1 in
 		/etc/init.d/ocfs2 restart
 		;;
 	force-umount)
-		/etc/init.d/llxcfg-ocfs2-umount-net stop
-		service llxcfg-ocfs2-net stop
+		/etc/init.d/ocfs2-umount stop
+		service ocfs2-tools stop
 		;;
 	start-service)
-		service llxcfg-ocfs2-net start
+		service ocfs2-tools start
 		;;
 	restart-service)
 		CHECK_MOUNT_OCFS2=$(LC_ALL=C awk -v dev="$OCFS2_DISK" -v fstab="$OCFS2_MOUNT_FSTAB" '$1 == dev && $2 == fstab && $3 == "ocfs2" { print "yes" }' /proc/mounts)
 		if [ "$CHECK_MOUNT_OCFS2" = "yes" ]; then
-			/etc/init.d/llxcfg-ocfs2-umount-net stop
+			/etc/init.d/ocfs2-umount stop
 		fi
-		service llxcfg-ocfs2-net stop
-		service llxcfg-ocfs2-net start
+		service ocfs2-tools stop
+		service ocfs2-tools start
 		;;
 	tune-nodes)
 		[ "$CHECK_MOUNT_OCFS2" = "yes" ] && echo "Please first umount your OCFS2 filesystem." && exit 0
@@ -73,17 +76,17 @@ case $1 in
 		echo "Please especify Max Node Slots."
 		;;
 	restart-cluster)
-		/etc/init.d/llxcfg-ocfs2-umount-net stop
-		service llxcfg-ocfs2-net stop
+		/etc/init.d/ocfs2-umount stop
+		service ocfs2-tools stop
 		/etc/init.d/ocfs2 stop
 		/etc/init.d/o2cb stop
 		/etc/init.d/o2cb start
 		/etc/init.d/ocfs2 start
-		service llxcfg-ocfs2-net start
+		service ocfs2-tools start
 		;;
 	reconfigure-ocfs2)
-		/etc/init.d/llxcfg-ocfs2-umount-net stop
-		service llxcfg-ocfs2-net stop
+		/etc/init.d/ocfs2-umount stop
+		service ocfs2-tools stop
 		/etc/init.d/ocfs2 stop
 		/etc/init.d/o2cb stop
 		export DEBIAN_FRONTEND=noninteractive
@@ -91,7 +94,7 @@ case $1 in
 		dpkg-reconfigure ocfs2-tools
 		/etc/init.d/o2cb restart
 		/etc/init.d/ocfs2 restart
-		service llxcfg-ocfs2-net start
+		service ocfs2-tools start
 		;;
 	cap-replication)
 		#[ "$2" = "ENABLED" ] && llxcfg-setvars CAP_DATA_REPLICATION='ENABLED'
--- ocfs2-tools-1.6.4.orig/o2image/o2image.8
+++ ocfs2-tools-1.6.4/o2image/o2image.8
@@ -50,7 +50,8 @@ L.
 Copies metadata blocks from /dev/sda1 device to sda1.out file
 
 [root@node1 ~] o2image -I /dev/sda1 sda1.out
-\fBUse with CAUTION\fR. Copies meta-data blocks from sda1.out onto the /dev/sda1 device.
+\fBUse with CAUTION\fR. Copies meta-data blocks from sda1.out onto the
+/dev/sda1 device.
 .TE
 
 .SH "SEE ALSO"
--- ocfs2-tools-1.6.4.orig/mkfs.ocfs2/mkfs.ocfs2.8
+++ ocfs2-tools-1.6.4/mkfs.ocfs2/mkfs.ocfs2.8
@@ -270,7 +270,7 @@ Users can query the features enabled in
 .TS
 ;
 L.
-[root@node1 ~]# tunefs.ocfs2 -Q "Label: %V\\nFeatures: %H %O\\n" /dev/sdg1
+[root@node ~]# tunefs.ocfs2 -Q "Label: %V\\nFeatures: %H %O\\n" /dev/sdg1
 Label: apache_files_10
 Features: sparse inline-data unwritten
 .TE