[Pkg-samba-maint] r954 - branches/samba4

[Steinar H. Gunderson]

Author: sesse
Date: 2006-01-15 22:35:43 +0000 (Sun, 15 Jan 2006)
New Revision: 954

Added:
   branches/samba4/provision.smb.conf.patch
Modified:
   branches/samba4/changelog
   branches/samba4/rules
Log:
Patch the smb.conf template to use the panic-action script by default.


Modified: branches/samba4/changelog
===================================================================
--- branches/samba4/changelog	2006-01-15 22:08:17 UTC (rev 953)
+++ branches/samba4/changelog	2006-01-15 22:35:43 UTC (rev 954)
@@ -1,8 +1,10 @@
 samba (3.9.0+SVN12947-1) UNRELEASED; urgency=low
 
   * Forward-port panic-action script from the Samba 3 packaging.
+    * Patch the smb.conf template to use the panic-action script by
+      default.
 
- -- Steinar H. Gunderson <sesse at debian.org>  Sun, 15 Jan 2006 23:02:55 +0100
+ -- Steinar H. Gunderson <sesse at debian.org>  Sun, 15 Jan 2006 23:18:14 +0100
 
 samba (3.9.0+SVN12946-1) experimental; urgency=low
 

Added: branches/samba4/provision.smb.conf.patch
===================================================================
--- branches/samba4/provision.smb.conf.patch	2006-01-15 22:08:17 UTC (rev 953)
+++ branches/samba4/provision.smb.conf.patch	2006-01-15 22:35:43 UTC (rev 954)
@@ -0,0 +1,9 @@
+--- provision.smb.conf.orig	2006-01-06 04:02:34.000000000 +0100
++++ provision.smb.conf	2006-01-15 23:16:11.000000000 +0100
+@@ -3,5 +3,6 @@
+ 	workgroup	= ${DOMAIN}
+ 	realm		= ${REALM}
+ 	server role     = pdc
++	panic action    = /usr/share/samba/panic-action
+ 
+ 

Modified: branches/samba4/rules
===================================================================
--- branches/samba4/rules	2006-01-15 22:08:17 UTC (rev 953)
+++ branches/samba4/rules	2006-01-15 22:35:43 UTC (rev 954)
@@ -65,6 +65,7 @@
 	$(MAKE) -C $(SOURCEPATH)/pidl install DESTDIR=$(CURDIR)/debian/tmp
 	install -m 755 $(CURDIR)/debian/panic-action $(CURDIR)/debian/tmp/usr/share/samba
 	install -m 755 $(CURDIR)/debian/gdbcommands $(CURDIR)/debian/tmp/etc/samba
+	patch $(CURDIR)/debian/tmp/usr/lib/samba/setup/provision.smb.conf $(CURDIR)/debian/provision.smb.conf.patch
 
 binary-arch: build install
 	dh_testdir