Update samba for new ipkg() -d option

[hvlinux.git] / stage5 / pkg / samba

diff --git a/stage5/pkg/samba b/stage5/pkg/samba
index a37bce8..3926f0d 100644 (file)
--- a/stage5/pkg/samba
+++ b/stage5/pkg/samba
@@ -3,14 +3,6 @@
 hvconfig_pre()
 {
     install -d /var/cache/samba
-
-    cd ${LFS_TMP}/${PACKAGE}/source
-    ./configure \
-        ${CONFIGURE_OPTS} \
-        --localstatedir=/var \
-        --with-piddir=/var/run \
-        --with-fhs \
-        --with-smbmount
 }
 
 hvbuild_post()
@@ -24,21 +16,32 @@ hvbuild_post()
     #chmod 644 /usr/include/libsmbclient.h /usr/lib/samba/libsmbclient.a
     chmod 644 /usr/include/libsmbclient.h
 
-    install -m755 nsswitch/libnss_win{s,bind}.so /lib
+    install -v -m755 nsswitch/libnss_win{s,bind}.so /lib
     ln -sf libnss_winbind.so /lib/libnss_winbind.so.2
     ln -sf libnss_wins.so /lib/libnss_wins.so.2
     cp ../examples/smb.conf.default /etc/samba
-    install -m644 ../docs/*.pdf /usr/share/samba
+    install -v -m644 ../docs/*.pdf /usr/share/samba
 
     if [ -f nsswitch/pam_winbind.so ]; then 
-        install -m755 nsswitch/pam_winbind.so /lib/security
+        install -v -m755 nsswitch/pam_winbind.so /lib/security
     fi
 
     # Configuring SWAT
     string_add "swat            901/tcp" /etc/services
     string_add "swat_tunnel     902/tcp" /etc/services
-    string_add "swat stream tcp nowait.400 root /usr/sbin/swat swat" \
-        /etc/inetd.conf
+
+    cat > /etc/xinetd.d/swat << "EOF"
+service swat
+{
+   disable        = no
+   socket_type    = stream
+   protocol       = tcp
+   wait           = no
+   user           = root
+   server         = /usr/sbin/swat
+   log_type       = SYSLOG local4 info
+}
+EOF
 
     # Bootscript
     install -v -m740 ${SCRDIR}/bootscripts/samba /etc/rc.d/init.d