add missing codepages, add syslog support and use it by default

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1996 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/openwrt/package/samba/Makefile b/openwrt/package/samba/Makefile
index 7a083b3..566e604 100644 (file)
--- a/openwrt/package/samba/Makefile
+++ b/openwrt/package/samba/Makefile
@@ -119,6 +119,7 @@ $(PKG_BUILD_DIR)/.built:
                        $(DISABLE_NLS) \
                        --with-lockdir=/var/run/samba \
                        --with-privatedir=/etc/samba \
                        $(DISABLE_NLS) \
                        --with-lockdir=/var/run/samba \
                        --with-privatedir=/etc/samba \

+                       --with-syslog \

        );
        $(MAKE) -C $(PKG_BUILD_DIR)/source \
                $(TARGET_CONFIGURE_OPTS) \
        );
        $(MAKE) -C $(PKG_BUILD_DIR)/source \
                $(TARGET_CONFIGURE_OPTS) \


@@ -160,6 +161,7 @@ $(IPKG_SAMBA):
        install -m0755 $(PKG_BUILD_DIR)/source/bin/smbd.shared $(IDIR_SAMBA)/usr/sbin/smbd
        install -d -m0755 $(IDIR_SAMBA)/usr/share/samba
        install -m0644 $(PKG_INSTALL_DIR)/usr/share/samba/codepage.{437,850} $(IDIR_SAMBA)/usr/share/samba/
        install -m0755 $(PKG_BUILD_DIR)/source/bin/smbd.shared $(IDIR_SAMBA)/usr/sbin/smbd
        install -d -m0755 $(IDIR_SAMBA)/usr/share/samba
        install -m0644 $(PKG_INSTALL_DIR)/usr/share/samba/codepage.{437,850} $(IDIR_SAMBA)/usr/share/samba/

+       install -m0644 $(PKG_INSTALL_DIR)/usr/share/samba/unicode_map.{437,850} $(IDIR_SAMBA)/usr/share/samba/

        $(RSTRIP) $(IDIR_SAMBA)
        $(IPKG_BUILD) $(IDIR_SAMBA) $(PACKAGE_DIR)
 
        $(RSTRIP) $(IDIR_SAMBA)
        $(IPKG_BUILD) $(IDIR_SAMBA) $(PACKAGE_DIR)
 

diff --git a/openwrt/package/samba/files/samba.init b/openwrt/package/samba/files/samba.init
index 43ab372..c3c600a 100644 (file)
--- a/openwrt/package/samba/files/samba.init
+++ b/openwrt/package/samba/files/samba.init
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 DEFAULT=/etc/default/samba
 #!/bin/sh
 
 DEFAULT=/etc/default/samba

-LOG_D=/var/log/samba

 RUN_D=/var/run/samba
 NMBD_PID_F=$RUN_D/nmbd.pid
 SMBD_PID_F=$RUN_D/smbd.pid
 RUN_D=/var/run/samba
 NMBD_PID_F=$RUN_D/nmbd.pid
 SMBD_PID_F=$RUN_D/smbd.pid


@@ -9,7 +8,6 @@ SMBD_PID_F=$RUN_D/smbd.pid
 
 case $1 in
  start)
 
 case $1 in
  start)

-  mkdir -p $LOG_D

   mkdir -p $RUN_D
   nmbd -D $NMBD_OPTIONS
   smbd -D $SMBD_OPTIONS
   mkdir -p $RUN_D
   nmbd -D $NMBD_OPTIONS
   smbd -D $SMBD_OPTIONS

diff --git a/openwrt/package/samba/files/smb.conf b/openwrt/package/samba/files/smb.conf
index 4c4cd1d..5a2f6cc 100644 (file)
--- a/openwrt/package/samba/files/smb.conf
+++ b/openwrt/package/samba/files/smb.conf
@@ -1,4 +1,6 @@
 [global]
 [global]

+ syslog = 0
+ syslog only = yes

  workgroup = OpenWrt
  security = share
  guest account = nobody
  workgroup = OpenWrt
  security = share
  guest account = nobody