[DRBD-cvs] svn commit by lars - r2575 - in branches/drbd-0.7: . scripts - stuff that lsb, debian or the suse build system do care

[drbd-cvs at lists.linbit.com]

Author: lars
Date: 2006-10-31 15:12:41 +0100 (Tue, 31 Oct 2006)
New Revision: 2575

Modified:
   branches/drbd-0.7/Makefile
   branches/drbd-0.7/scripts/drbd
Log:
stuff that lsb, debian or the suse build system do care about...


Modified: branches/drbd-0.7/Makefile
===================================================================
--- branches/drbd-0.7/Makefile	2006-10-27 09:01:19 UTC (rev 2574)
+++ branches/drbd-0.7/Makefile	2006-10-31 14:12:41 UTC (rev 2575)
@@ -160,9 +160,6 @@
 
 KDIR := $(shell echo /lib/modules/`uname -r`/build)
 KVER := $(shell KDIR=$(KDIR) O=$(O) scripts/get_uts_release.sh)
-ifeq ($(KVER),)
-$(error "could not determine uts_release")
-endif
 
 kernel-patch: drbd/drbd_buildtag.c
 	set -o errexit; \
@@ -173,6 +170,10 @@
 
 # maybe even dist/RPMS/$(ARCH) ?
 rpm: tgz
+	@if [ -z "$(KVER)" ]; then \
+		echo "Could not determine uts_release" ; \
+		false ; \
+	fi
 	mkdir -p dist/BUILD \
 	         dist/RPMS  \
 	         dist/SPECS \

Modified: branches/drbd-0.7/scripts/drbd
===================================================================
--- branches/drbd-0.7/scripts/drbd	2006-10-27 09:01:19 UTC (rev 2574)
+++ branches/drbd-0.7/scripts/drbd	2006-10-31 14:12:41 UTC (rev 2575)
@@ -10,17 +10,17 @@
 ### BEGIN INIT INFO
 # Provides: drbd
 # Required-Start: $network $syslog sshd
-# Required-Stop:
+# Required-Stop: $network $syslog sshd
 # Default-Start:  3 5
 # Default-Stop:   0 1 2 6
-# Description:    Control drbd resources.
+# Short-Description: Basic configuration of drbd resources.
 ### END INIT INFO
 
 DEFAULTFILE="/etc/default/drbd"
 DRBDADM="/sbin/drbdadm"
 PROC_DRBD="/proc/drbd"
-MODPROBE="modprobe"
-RMMOD="rmmod"
+MODPROBE="/sbin/modprobe"
+RMMOD="/sbin/rmmod"
 UDEV_TIMEOUT=10
 ADD_MOD_PARAM=""