Sophie: drbd-utils-8.4.2-1.mga3 src

drbd-utils-8.4.2-1.mga3.src.rpm

diff -Naurp drbd-8.4.2/drbd/drbd_main.c drbd-8.4.2-usrsbin/drbd/drbd_main.c
--- drbd-8.4.2/drbd/drbd_main.c	2012-08-30 08:14:16.000000000 -0400
+++ drbd-8.4.2-usrsbin/drbd/drbd_main.c	2013-01-20 15:53:53.879567047 -0500
@@ -119,8 +119,8 @@ bool allow_oos;
 int proc_details;       /* Detail level in proc drbd*/
 
 /* Module parameter for setting the user mode helper program
- * to run. Default is /sbin/drbdadm */
-char usermode_helper[80] = "/sbin/drbdadm";
+ * to run. Default is /usr/sbin/drbdadm */
+char usermode_helper[80] = "/usr/sbin/drbdadm";
 
 module_param_string(usermode_helper, usermode_helper, sizeof(usermode_helper), 0644);
 
diff -Naurp drbd-8.4.2/scripts/block-drbd drbd-8.4.2-usrsbin/scripts/block-drbd
--- drbd-8.4.2/scripts/block-drbd	2011-01-20 10:11:25.000000000 -0500
+++ drbd-8.4.2-usrsbin/scripts/block-drbd	2013-01-20 15:55:04.442684887 -0500
@@ -250,11 +250,11 @@ case "$command" in
     case $t in 
       drbd)
         drbd_resource=$p
-        drbd_role="$(/sbin/drbdadm role $drbd_resource)"
+        drbd_role="$(/usr/sbin/drbdadm role $drbd_resource)"
         drbd_lrole="${drbd_role%%/*}"
-        drbd_dev="$(/sbin/drbdadm sh-dev $drbd_resource)"
+        drbd_dev="$(/usr/sbin/drbdadm sh-dev $drbd_resource)"
         if [ "$drbd_lrole" != 'Primary' ]; then
-          /sbin/drbdadm primary $drbd_resource
+          /usr/sbin/drbdadm primary $drbd_resource
         fi
         dev=$drbd_dev
         FRONTEND_ID=$(xenstore_read "$XENBUS_PATH/frontend-id")
@@ -279,12 +279,12 @@ case "$command" in
       drbd)
         p=$(xenstore_read "$XENBUS_PATH/params")
         drbd_resource=$p
-        drbd_role="$(/sbin/drbdadm role $drbd_resource)"
+        drbd_role="$(/usr/sbin/drbdadm role $drbd_resource)"
         drbd_lrole="${drbd_role%%/*}"
-        drbd_dev="$(/sbin/drbdadm sh-dev $drbd_resource)"
+        drbd_dev="$(/usr/sbin/drbdadm sh-dev $drbd_resource)"
 
         if [ "$drbd_lrole" != 'Secondary' ]; then
-          /sbin/drbdadm secondary $drbd_resource
+          /usr/sbin/drbdadm secondary $drbd_resource
         fi
         exit 0
         ;;
diff -Naurp drbd-8.4.2/scripts/drbd drbd-8.4.2-usrsbin/scripts/drbd
--- drbd-8.4.2/scripts/drbd	2012-07-25 11:43:22.000000000 -0400
+++ drbd-8.4.2-usrsbin/scripts/drbd	2013-01-20 15:55:53.526071260 -0500
@@ -22,8 +22,8 @@
 ### END INIT INFO
 
 DEFAULTFILE="/etc/default/drbd"
-DRBDADM="/sbin/drbdadm"
-DRBDSETUP="/sbin/drbdsetup"
+DRBDADM="/usr/sbin/drbdadm"
+DRBDSETUP="/usr/sbin/drbdsetup"
 PROC_DRBD="/proc/drbd"
 MODPROBE="/sbin/modprobe"
 RMMOD="/sbin/rmmod"
diff -Naurp drbd-8.4.2/scripts/drbddisk drbd-8.4.2-usrsbin/scripts/drbddisk
--- drbd-8.4.2/scripts/drbddisk	2011-01-20 10:11:25.000000000 -0500
+++ drbd-8.4.2-usrsbin/scripts/drbddisk	2013-01-20 15:56:07.599895313 -0500
@@ -8,7 +8,7 @@
 ###
 
 DEFAULTFILE="/etc/default/drbd"
-DRBDADM="/sbin/drbdadm"
+DRBDADM="/usr/sbin/drbdadm"
 
 if [ -f $DEFAULTFILE ]; then
   . $DEFAULTFILE
diff -Naurp drbd-8.4.2/scripts/drbd.gentoo drbd-8.4.2-usrsbin/scripts/drbd.gentoo
--- drbd-8.4.2/scripts/drbd.gentoo	2011-07-15 04:56:32.000000000 -0400
+++ drbd-8.4.2-usrsbin/scripts/drbd.gentoo	2013-01-20 15:56:33.411572623 -0500
@@ -21,7 +21,7 @@ depend() {
 opts="${opts} reload"
 
 DEFAULTFILE="/etc/conf.d/drbd"
-DRBDADM="/sbin/drbdadm"
+DRBDADM="/usr/sbin/drbdadm"
 PROC_DRBD="/proc/drbd"
 MODPROBE="/sbin/modprobe"
 RMMOD="/sbin/rmmod"
diff -Naurp drbd-8.4.2/scripts/drbd.rules drbd-8.4.2-usrsbin/scripts/drbd.rules
--- drbd-8.4.2/scripts/drbd.rules	2012-04-03 04:30:23.000000000 -0400
+++ drbd-8.4.2-usrsbin/scripts/drbd.rules	2013-01-20 15:56:46.786405414 -0500
@@ -12,4 +12,4 @@
 # having it as one single line avoids those problems.
 #
 # DO NOT WRAP THIS LINE
-SUBSYSTEM=="block", KERNEL=="drbd*", IMPORT{program}="/sbin/drbdadm sh-udev minor-%m", NAME="$env{DEVICE}", SYMLINK="drbd/by-res/$env{RESOURCE} drbd/by-disk/$env{DISK}"
+SUBSYSTEM=="block", KERNEL=="drbd*", IMPORT{program}="/usr/sbin/drbdadm sh-udev minor-%m", NAME="$env{DEVICE}", SYMLINK="drbd/by-res/$env{RESOURCE} drbd/by-disk/$env{DISK}"
diff -Naurp drbd-8.4.2/scripts/drbdupper drbd-8.4.2-usrsbin/scripts/drbdupper
--- drbd-8.4.2/scripts/drbdupper	2011-01-20 10:11:25.000000000 -0500
+++ drbd-8.4.2-usrsbin/scripts/drbdupper	2013-01-20 15:57:06.446159633 -0500
@@ -11,7 +11,7 @@
 ###
 
 DEFAULTFILE="/etc/default/drbd"
-DRBDADM="/sbin/drbdadm"
+DRBDADM="/usr/sbin/drbdadm"
 
 if [ -f $DEFAULTFILE ]; then
   . $DEFAULTFILE
diff -Naurp drbd-8.4.2/scripts/Makefile.in drbd-8.4.2-usrsbin/scripts/Makefile.in
--- drbd-8.4.2/scripts/Makefile.in	2012-04-06 06:19:56.000000000 -0400
+++ drbd-8.4.2-usrsbin/scripts/Makefile.in	2013-01-20 15:58:31.749093200 -0500
@@ -151,4 +151,4 @@ uninstall:
 	rm -f $(DESTDIR)$(sysconfdir)/ha.d/resource.d/drbdupper
 	rm -f $(DESTDIR)$(sysconfdir)/xen/scripts/block-drbd
 	rm -f $(DESTDIR)$(sysconfdir)/bash_completion.d/$(COMPLETION)
-	! test -L $(DESTDIR)/sbin/rcdrbd || rm $(DESTDIR)/sbin/rcdrbd
+	! test -L $(DESTDIR)/usr/sbin/rcdrbd || rm $(DESTDIR)/usr/sbin/rcdrbd
diff -Naurp drbd-8.4.2/user/Makefile.in drbd-8.4.2-usrsbin/user/Makefile.in
--- drbd-8.4.2/user/Makefile.in	2012-05-07 10:44:29.000000000 -0400
+++ drbd-8.4.2-usrsbin/user/Makefile.in	2013-01-20 16:06:00.014489111 -0500
@@ -113,17 +113,17 @@ distclean: clean
 
 install:
 ifeq ($(WITH_UTILS),yes)
-	install -d $(DESTDIR)/sbin/
+	install -d $(DESTDIR)/usr/sbin/
 	install -d $(DESTDIR)$(localstatedir)/lib/drbd
 	install -d $(DESTDIR)$(localstatedir)/lock
 	if getent group haclient > /dev/null 2> /dev/null ; then	\
-		install -g haclient -m 4750 drbdsetup $(DESTDIR)/sbin/ ;	\
-		install -g haclient -m 4750 drbdmeta $(DESTDIR)/sbin/ ;	\
-		install -m 755 drbdadm $(DESTDIR)/sbin/ ;		\
+		install -g haclient -m 4750 drbdsetup $(DESTDIR)/usr/sbin/ ;	\
+		install -g haclient -m 4750 drbdmeta $(DESTDIR)/usr/sbin/ ;	\
+		install -m 755 drbdadm $(DESTDIR)/usr/sbin/ ;		\
 	else								\
-		install -m 755 drbdsetup $(DESTDIR)/sbin/ ;		\
-		install -m 755 drbdmeta $(DESTDIR)/sbin/ ;		\
-		install -m 755 drbdadm $(DESTDIR)/sbin/ ; 		\
+		install -m 755 drbdsetup $(DESTDIR)/usr/sbin/ ;		\
+		install -m 755 drbdmeta $(DESTDIR)/usr/sbin/ ;		\
+		install -m 755 drbdadm $(DESTDIR)/usr/sbin/ ; 		\
 	fi
 	$(MAKE) -C legacy install
 endif