[Ocfs2-tools-commits] jlbec commits r944 - in trunk: . debian
ocfs2_hb_ctl vendor/common
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Tue Jun 14 09:59:38 CDT 2005
Author: jlbec
Date: 2005-06-14 09:59:36 -0500 (Tue, 14 Jun 2005)
New Revision: 944
Modified:
trunk/
trunk/debian/
trunk/debian/ocfs2-tools.files
trunk/debian/ocfs2-tools.manpages
trunk/debian/rules
trunk/ocfs2_hb_ctl/
trunk/vendor/common/o2cb.init
Log:
o Add ocfs2_hb_ctl.8 to the debian manpage list
o Change the debian setup to use dh_installinit.
Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
- cscope.out
*.a
stamp-md5
configure
Config.make
config.*
autom4te.cache
aclocal.m4
ocfs2-tools-*.src.rpm
ocfs2-tools-*.tar.gz
+ cscope.out
*.a
stamp-md5
configure
Config.make
config.*
autom4te.cache
aclocal.m4
ocfs2-tools-*.src.rpm
ocfs2-tools-*.tar.gz
build-stamp
Property changes on: trunk/debian
___________________________________________________________________
Name: svn:ignore
- .*.sw?
files
*.debhelper
tmp
dsh
*.substvars
+ .*.sw?
files
*.debhelper
tmp
dsh
*.substvars
ocfs2-tools.o2cb.default
ocfs2console
ocfs2-tools.o2cb.init
ocfs2-tools
Modified: trunk/debian/ocfs2-tools.files
===================================================================
--- trunk/debian/ocfs2-tools.files 2005-06-14 14:12:15 UTC (rev 943)
+++ trunk/debian/ocfs2-tools.files 2005-06-14 14:59:36 UTC (rev 944)
@@ -7,5 +7,3 @@
sbin/mount.ocfs2
sbin/ocfs2cdsl
sbin/ocfs2_hb_ctl
-etc/init.d/o2cb
-etc/sysconfig/o2cb
Modified: trunk/debian/ocfs2-tools.manpages
===================================================================
--- trunk/debian/ocfs2-tools.manpages 2005-06-14 14:12:15 UTC (rev 943)
+++ trunk/debian/ocfs2-tools.manpages 2005-06-14 14:59:36 UTC (rev 944)
@@ -5,4 +5,5 @@
debian/tmp/usr/share/man/man8/tunefs.ocfs2.8
debian/tmp/usr/share/man/man8/mounted.ocfs2.8
debian/tmp/usr/share/man/man8/o2cb_ctl.8
+debian/tmp/usr/share/man/man8/ocfs2_hb_ctl.8
debian/tmp/usr/share/man/man8/ocfs2cdsl.8
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2005-06-14 14:12:15 UTC (rev 943)
+++ trunk/debian/rules 2005-06-14 14:59:36 UTC (rev 944)
@@ -27,6 +27,8 @@
-$(MAKE) -i distclean
+ rm -f debian/ocfs2-tools.o2cb.init
+ rm -f debian/ocfs2-tools.o2cb.default
dh_clean
install: DH_OPTIONS=
@@ -36,10 +38,8 @@
dh_clean -k
dh_installdirs
- mkdir -p debian/tmp/etc/init.d
- cp -f vendor/common/o2cb.init debian/tmp/etc/init.d/o2cb
- mkdir -p debian/tmp/etc/sysconfig
- cp -f vendor/common/o2cb.sysconfig debian/tmp/etc/sysconfig/o2cb
+ cp -f vendor/common/o2cb.init debian/ocfs2-tools.o2cb.init
+ cp -f vendor/common/o2cb.sysconfig debian/ocfs2-tools.o2cb.default
$(MAKE) DESTDIR=`pwd`/debian/tmp install
@@ -66,7 +66,7 @@
# dh_installemacsen
# dh_installpam
# dh_installmime
-# dh_installinit
+ dh_installinit --name=o2cb
dh_installman
# dh_installcron
# dh_installinfo
Property changes on: trunk/ocfs2_hb_ctl
___________________________________________________________________
Name: svn:ignore
- .*.sw?
ocfs2_hb_ctl
*.d
cscope.*
+ .*.sw?
ocfs2_hb_ctl
ocfs2_hb_ctl.8
*.d
cscope.*
Modified: trunk/vendor/common/o2cb.init
===================================================================
--- trunk/vendor/common/o2cb.init 2005-06-14 14:12:15 UTC (rev 943)
+++ trunk/vendor/common/o2cb.init 2005-06-14 14:59:36 UTC (rev 944)
@@ -17,8 +17,10 @@
# Force LC_ALL=C
export LC_ALL=C
-# Source configuration
+# Source configuration, Red Hat and Novell
[ -f /etc/sysconfig/o2cb ] && . /etc/sysconfig/o2cb
+# Source configuration, Debian
+[ -f /etc/default/o2cb ] && . /etc/default/o2cb
# XXX some description of what this does
LOAD_ACTIONS=("load_module configfs"
More information about the Ocfs2-tools-commits
mailing list