[DRBD-cvs] r1631 - branches/drbd-0.7/drbd

[svn at svn.drbd.org]

Author: lars
Date: 2004-11-06 10:31:13 +0100 (Sat, 06 Nov 2004)
New Revision: 1631

Modified:
   branches/drbd-0.7/drbd/Makefile
   branches/drbd-0.7/drbd/drbd_sizeof_sanity_check.c
Log:
use adjust_drbd_config_h.sh script even if not 'chmod +x'ed

Modified: branches/drbd-0.7/drbd/Makefile
===================================================================
--- branches/drbd-0.7/drbd/Makefile	2004-11-06 08:55:53 UTC (rev 1630)
+++ branches/drbd-0.7/drbd/Makefile	2004-11-06 09:31:13 UTC (rev 1631)
@@ -97,8 +97,8 @@
 
   kbuild: drbd_buildtag.c
 	@rm -f .kernelrelease*
-	-test -x ../scripts/adjust_drbd_config_h.sh && \
-	 KDIR=$(KDIR) ../scripts/adjust_drbd_config_h.sh
+	-test -f ../scripts/adjust_drbd_config_h.sh && \
+	 KDIR=$(KDIR) $(SHELL) ../scripts/adjust_drbd_config_h.sh
   ifeq ($(KDIR_Makefile_PATCHLEVEL),4)
 	$(MAKE) -C $(KDIR) SUBDIRS=$(DRBDSRC) $(ARCH_UM) modules
   else

Modified: branches/drbd-0.7/drbd/drbd_sizeof_sanity_check.c
===================================================================
--- branches/drbd-0.7/drbd/drbd_sizeof_sanity_check.c	2004-11-06 08:55:53 UTC (rev 1630)
+++ branches/drbd-0.7/drbd/drbd_sizeof_sanity_check.c	2004-11-06 09:31:13 UTC (rev 1631)
@@ -8,8 +8,7 @@
 #define SZO(type,size) \
 	s = sizeof(type); \
 	if (s != size) { \
-		printk("<3>sizeof(" #type "): %d != %d; " \
-			"ioctls won't work, aborting\n", s, size); \
+		printk("<3>sizeof(" #type "): %d != %d\n", s, size); \
 		err = -1; \
 	}
 
@@ -24,5 +23,6 @@
 	SZO(struct ioctl_syncer_config,	 32)
 	SZO(struct ioctl_wait,		 16)
 	SZO(struct ioctl_get_config,	440)
+	if (err) printk("<3>ioctls won't work, aborting\n");
 	return err;
 }