[SCM] Samba Shared Repository - branch master updated

Matthias Dieter Wallnöfer mdw at samba.org
Mon Mar 8 12:38:56 MST 2010


The branch, master has been updated
       via  fde707a... s4:"dns_update_list" file: install it properly into the private directory
       via  a34eafc... Revert "s4:script/installmisc.sh - install "dns_update_list" to target setup folder"
      from  8d3b7d4... LDB:asq module - change counters to "unsigned" where appropriate

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit fde707aa0c563d239c2f8c442cddfee0b6ff057f
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Mon Mar 8 20:36:16 2010 +0100

    s4:"dns_update_list" file: install it properly into the private directory
    
    This is what the "samba_dnsupdate" script requests (line 220).

commit a34eafc693d8750c0883823068e5c6f7355efa04
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Mon Mar 8 20:30:06 2010 +0100

    Revert "s4:script/installmisc.sh - install "dns_update_list" to target setup folder"
    
    This reverts commit b49276e291274652d46eed39249c07531e32b591.

-----------------------------------------------------------------------

Summary of changes:
 source4/Makefile              |    2 +-
 source4/script/installmisc.sh |   16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/Makefile b/source4/Makefile
index 0da1ee2..dd9376b 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -243,7 +243,7 @@ installman:: manpages installdirs
 	@$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(mandir) $(MANPAGES)
 
 installmisc:: installdirs
-	@$(SHELL) $(srcdir)/script/installmisc.sh "$(DESTDIR)" $(srcdir) $(DESTDIR)$(setupdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(pythondir) $(PYTHON)
+	@$(SHELL) $(srcdir)/script/installmisc.sh "$(DESTDIR)" $(srcdir) $(DESTDIR)$(setupdir) $(DESTDIR)$(privatedir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(pythondir) $(PYTHON)
 
 installpc:: installdirs
 	@$(SHELL) $(srcdir)/script/installpc.sh $(builddir) $(DESTDIR)$(pkgconfigdir) $(PC_FILES)
diff --git a/source4/script/installmisc.sh b/source4/script/installmisc.sh
index 6aaf6be..5c7d76d 100755
--- a/source4/script/installmisc.sh
+++ b/source4/script/installmisc.sh
@@ -1,18 +1,19 @@
 #!/bin/sh
 # install miscellaneous files
 
-[ $# -eq 7 ] || {
-    echo "Usage: installmisc.sh DESTDIR SRCDIR SETUPDIR BINDDIR SBINDDIR PYTHONDIR PYTHON"
+[ $# -eq 8 ] || {
+    echo "Usage: installmisc.sh DESTDIR SRCDIR SETUPDIR PRIVATEDIR BINDDIR SBINDDIR PYTHONDIR PYTHON"
     exit 1
 }
 
 DESTDIR="$1"
 SRCDIR="$2"
 SETUPDIR="$3"
-BINDIR="$4"
-SBINDIR="$5"
-PYTHONDIR="$6"
-PYTHON="$7"
+PRIVATEDIR="$4"
+BINDIR="$5"
+SBINDIR="$6"
+PYTHONDIR="$7"
+PYTHON="$8"
 
 cd $SRCDIR || exit 1
 
@@ -79,7 +80,6 @@ cp setup/named.conf.update $SETUPDIR || exit 1
 cp setup/provision.smb.conf.dc $SETUPDIR || exit 1
 cp setup/provision.smb.conf.member $SETUPDIR || exit 1
 cp setup/provision.smb.conf.standalone $SETUPDIR || exit 1
-cp setup/dns_update_list $SETUPDIR || exit 1
 
 echo "Installing external python libraries"
 mkdir -p $PYTHONDIR/samba_external || exit 1
@@ -90,5 +90,7 @@ do
   cp -r scripting/python/samba_external/$p/* $PYTHONDIR/samba_external/$p/ || exit 1
 done
 
+echo "Installing stuff in $PRIVATEDIR"
+cp setup/dns_update_list $PRIVATEDIR || exit 1
 
 exit 0


-- 
Samba Shared Repository


More information about the samba-cvs mailing list