[DRBD-cvs] drbd by lars; .: added trustix to "known" distros user...

[drbd-user@lists.linbit.com]

DRBD CVS committal

Author  : lars
Module  : drbd

Dir     : drbd


Modified Files:
	Makefile.SuSE-9.0 Makefile.vars drbd.spec.in 


Log Message:
.: added trustix to "known" distros
user: exculde default "do not change" value
      from range check for sync-nice
scripts: removed absolute path from logger

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/Makefile.SuSE-9.0,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.SuSE-9.0	8 Feb 2004 19:39:57 -0000	1.1
+++ Makefile.SuSE-9.0	22 Feb 2004 20:42:45 -0000	1.2
@@ -22,22 +22,24 @@
 # dockbook2man just does not work.
 # this does:
 DB2MAN :=\
-@doit() { in=$$$$1		;\
+@_db2man() { in=$$$$1		;\
  echo "  [DB2MAN] $$$$in"	;\
  nsgmls "$$$$in" |\
  sgmlspl /usr/share/sgml/docbook/utils-0.6.6/helpers/docbook2man-spec.pl;\
-}; doit
+}; _db2man
 
 # dockbook2html produces errors and swallows tables.
 # db2html works, but in contrast do dockbook2man creates 
 # a subdirectory and some extra files ...
 # this works for me:
 DB2HTML :=\
-doit() { in=$$$$1; base=$$$${in%.sgml}		;\
+_db2html() { in=$$$$1; base=$$$${in%.sgml}	;\
  echo " [DB2HTML] $$$$in"			;\
  db2html "$$$$in"				;\
  ln -sf t1.html $$$$base/index.html		;\
-}; doit
+ mv $$$$base/*.html .				;\
+ rm -rf $$$$base/				;\
+}; _db2html
 
 #RPMOPTIONS=--sign
 RPMOPTIONS := --define "skip_make_doc true"
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/Makefile.vars,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- Makefile.vars	28 Nov 2003 08:32:52 -0000	1.69
+++ Makefile.vars	22 Feb 2004 20:42:45 -0000	1.70
@@ -39,11 +39,12 @@
 
 ## Magic starts here:
 DIST            :=$(strip \
+  $(if $(wildcard /etc/trustix-release),trustix,\
   $(if $(wildcard /etc/debian_version),debian,\
   $(if $(wildcard /etc/redhat-release),redhat,\
   $(if $(wildcard /etc/slackware-version),slackware,\
   $(if $(wildcard /etc/ROCK-VERSION),rock,\
-  $(if $(wildcard /var/lib/YaST*),suse,))))))
+  $(if $(wildcard /var/lib/YaST*),suse,)))))))
 
 SUBDIRS = user documentation scripts benchmark drbd #testing
 
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd.spec.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- drbd.spec.in	10 Feb 2004 13:57:04 -0000	1.4
+++ drbd.spec.in	22 Feb 2004 20:42:45 -0000	1.5
@@ -98,7 +98,7 @@
 #
 find etc/ -name drbd -printf "/%p\n" > "$FILELIST"
 # on suse/united we have additionally:
-find sbin/rcdrbd -printf "/%p\n" >> "$FILELIST"
+test -e sbin/rcdrbd && echo "/sbin/rcdrbd" >> "$FILELIST"
 
 ## If I only wanted to include the module, not all the directories
 ## I'd then say  %files -n kernel%{?ksmp}-module-drbd -f $FILELIST.mod below