r2110 - in trunk

[dslinux_sonny_jim at dslinux.in-berlin.de]

Author: sonny_jim
Date: 2008-01-23 17:52:32 +0100 (Wed, 23 Jan 2008)
New Revision: 2110

Log:
Importing samba and enabling in DLDI builds

Copied: trunk/user/samba (from rev 2109, tags/samba/samba_uClinux-dist-20070130)

Modified: trunk/user/samba/Makefile
===================================================================
--- tags/samba/samba_uClinux-dist-20070130/Makefile	2008-01-23 13:56:31 UTC (rev 2109)
+++ trunk/user/samba/Makefile	2008-01-23 16:52:32 UTC (rev 2110)
@@ -4,8 +4,3 @@
 	$(MAKE) -C source clean
 romfs:
 	$(MAKE) -C source romfs
-	if [ -d "$(ROMFSDIR)/etc/default/" ]; then \
-		echo "[global]" > $(ROMFSDIR)/etc/default/smb.conf ; \
-	else \
-		echo "[global]" > $(ROMFSDIR)/etc/smb.conf ; \
-	fi

Added: trunk/user/samba/examples/smb.conf.dslinux


Property changes on: trunk/user/samba/examples/smb.conf.dslinux
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/user/samba/source/Makefile.in
===================================================================
--- tags/samba/samba_uClinux-dist-20070130/source/Makefile.in	2008-01-23 13:56:31 UTC (rev 2109)
+++ trunk/user/samba/source/Makefile.in	2008-01-23 16:52:32 UTC (rev 2110)
@@ -100,7 +100,7 @@
 LIBSMB_OPTS=-L ./bin -lsmbclient -ldl
 else
 LIBSMBCLIENT=bin/libsmbclient.a
-LIBSMB_OPTS=$(LIBSMBCLIENT) -ldl
+LIBSMB_OPTS=$(LIBSMBCLIENT)
 endif
 LIBSMBCLIENT_MAJOR=0
 LIBSMBCLIENT_MINOR=1

Modified: trunk/user/samba/source/makefile
===================================================================
--- tags/samba/samba_uClinux-dist-20070130/source/makefile	2008-01-23 13:56:31 UTC (rev 2109)
+++ trunk/user/samba/source/makefile	2008-01-23 16:52:32 UTC (rev 2110)
@@ -4,8 +4,8 @@
 SHARED := disable
 endif
 
-CONFOPTS = --prefix= --with-smbmount --with-privatedir=/etc/config \
-			--with-configdir=/etc/config --with-logfilebase=/var/log \
+CONFOPTS = --prefix= --with-smbmount --host=arm-linux-elf --with-privatedir=/etc/ \
+			--with-configdir=/etc/ --with-logfilebase=/var/log \
 			--without-ldap --disable-cups \
 			--$(SHARED)-shared --disable-debug --disable-developer \
 			--disable-krb5developer --disable-dmalloc --disable-nls
@@ -33,3 +33,14 @@
 	$(ROMFSINST) -e CONFIG_USER_SAMBA_SMBMOUNT build/bin/smbmnt /bin/smbmnt
 	$(ROMFSINST) -e CONFIG_USER_SAMBA_SMBMOUNT build/bin/smbmount /bin/smbmount
 	$(ROMFSINST) -e CONFIG_USER_SAMBA_SMBUMOUNT build/bin/smbumount /bin/smbumount
+	$(ROMFSINST) -e CONFIG_USER_SAMBA_SMBD ../examples/smb.conf.dslinux /etc/smb.conf
+	$(ROMFSINST) -e CONFIG_USER_SAMBA_SMBD \
+	                -a "netbios-ssn 139/tcp" /etc/services
+	$(ROMFSINST) -e CONFIG_USER_SAMBA_NMBD \
+	                -a "netbios-ns 137/udp" /etc/services
+	$(ROMFSINST) -e CONFIG_USER_SAMBA_SMBD \
+	                -a "root::0:root" /etc/group
+	$(ROMFSINST) -e CONFIG_USER_SAMBA_SMBD \
+                        -a "#netbios-ssn stream tcp nowait root /usr/bin/smbd -F" /etc/inetd.conf.example
+	$(ROMFSINST) -e CONFIG_USER_SAMBA_NMBD \
+                        -a "#netbios-ns dgram udp wait root /usr/bin/nmbd -F" /etc/inetd.conf.example

Modified: trunk/vendors/Nintendo/DLDI/Makefile
===================================================================
--- trunk/vendors/Nintendo/DLDI/Makefile	2008-01-23 13:56:31 UTC (rev 2109)
+++ trunk/vendors/Nintendo/DLDI/Makefile	2008-01-23 16:52:32 UTC (rev 2110)
@@ -11,7 +11,7 @@
 
 ROMFS_DIRS := boot dev proc sbin $(FATFS)/linux $(OPTDIR) tmp 
 
-FS_DIRS := etc/rc.d home lib usr/bin usr/games usr/lib usr/share/udhcpc var/tmp var/run var/log var/www
+FS_DIRS := etc/rc.d home lib usr/bin usr/games usr/lib usr/share/udhcpc var/lock var/tmp var/run var/log var/www
 
 TTYP_DEVICES = 0 1 2 3 4 5 6 7 8 9 a b c d e f
 

Modified: trunk/vendors/Nintendo/DLDI/config.vendor
===================================================================
--- trunk/vendors/Nintendo/DLDI/config.vendor	2008-01-23 13:56:31 UTC (rev 2109)
+++ trunk/vendors/Nintendo/DLDI/config.vendor	2008-01-23 16:52:32 UTC (rev 2110)
@@ -176,11 +176,11 @@
 #
 # SAMBA
 #
-# CONFIG_USER_SAMBA is not set
-# CONFIG_USER_SAMBA_SMBD is not set
-# CONFIG_USER_SAMBA_NMBD is not set
-# CONFIG_USER_SAMBA_SMBMOUNT is not set
-# CONFIG_USER_SAMBA_SMBUMOUNT is not set
+CONFIG_USER_SAMBA=y
+CONFIG_USER_SAMBA_SMBD=y
+CONFIG_USER_SAMBA_NMBD=y
+CONFIG_USER_SAMBA_SMBMOUNT=y
+CONFIG_USER_SAMBA_SMBUMOUNT=y
 
 #
 # SMBFS

Modified: trunk/vendors/Nintendo/common/rc.d/inetd
===================================================================
--- trunk/vendors/Nintendo/common/rc.d/inetd	2008-01-23 13:56:31 UTC (rev 2109)
+++ trunk/vendors/Nintendo/common/rc.d/inetd	2008-01-23 16:52:32 UTC (rev 2110)
@@ -29,6 +29,17 @@
 			echo "but there is no SSH host key yet."
 			/usr/bin/dropbearkey -t rsa -f $SSH_HOST_KEY
 		fi		
+		
+		# Check for existence of samba password
+		# Generate if not found and smbd enabled
+
+		if grep netbios-ssn $INETD_CONF | grep -v "^#" >/dev/null \
+			&& [ ! -e /etc/smbpasswd ]
+		then
+			echo "Generating default smbpasswd"
+			echo "You are advised to change this with smbpasswd"
+			(echo uClinux ; echo uClinux) | /usr/bin/smbpasswd -a root -s
+		fi
 		$DAEMON &
 	;;
 	stop)