diff options
| -rw-r--r-- | packaging/Solaris/makepkg.sh | 9 | ||||
| -rw-r--r-- | packaging/Solaris/pkginfo.master | 4 | ||||
| -rw-r--r-- | packaging/Solaris/prototype.master | 2 | ||||
| -rwxr-xr-x | packaging/Solaris/samba.init.master | 19 |
4 files changed, 24 insertions, 10 deletions
diff --git a/packaging/Solaris/makepkg.sh b/packaging/Solaris/makepkg.sh index aaa176c4e7..d3506619e0 100644 --- a/packaging/Solaris/makepkg.sh +++ b/packaging/Solaris/makepkg.sh @@ -54,9 +54,11 @@ add_dynamic_entries() echo f none bin/smbsh 0755 root other fi - echo "#\n# nss_winbind.so\n#" + echo "#\n# nss_winbind.so and nss_wins.so\n#" echo f none /lib/nss_winbind.so.1=lib/nss_winbind.so.1 0755 root other + echo f none /lib/nss_wins.so.1=lib/nss_wins.so.1 0755 root other # echo s none /lib/nss_winbind.so.1=/usr/lib/nss_winbind.so.1 0755 root other + # echo s none /lib/nss_wins.so.1=/usr/lib/nss_wins.so.1 0755 root other if [ -f lib/pam_winbind.so ]; then echo f none /usr/lib/security/pam_winbind.so=lib/pam_winbind.so 0755 root other fi @@ -146,6 +148,7 @@ SBINDIR=`bin/smbd -b | grep SBINDIR | awk '{print $2}'` BINDIR=`bin/smbd -b | grep BINDIR | grep -v SBINDIR | awk '{print $2}'` SWATDIR=`bin/smbd -b | grep SWATDIR | awk '{print $2}'` CONFIGFILE=`bin/smbd -b | grep CONFIGFILE | awk '{print $2}'` +LOCKDIR=`bin/smbd -b | grep LOCKDIR | awk '{print $2}'` CONFIGDIR=`dirname $CONFIGFILE` LOGFILEBASE=`bin/smbd -b | grep LOGFILEBASE | awk '{print $2}'` LIBDIR=`bin/smbd -b | grep LIBDIR | awk '{print $2}'` @@ -154,8 +157,9 @@ PRIVATE_DIR=`bin/smbd -b | grep PRIVATE_DIR | awk '{print $2}'` DOCDIR=$INSTALL_BASE/docs ## -## copy some misc files that are ont done as part of 'make install' +## copy some misc files that are not done as part of 'make install' ## +cp -fp nsswitch/libnss_wins.so $TMPINSTALLDIR/$LIBDIR/nss_wins.so.1 cp -fp nsswitch/libnss_winbind.so $TMPINSTALLDIR/$LIBDIR/nss_winbind.so.1 if [ -f nsswitch/pam_winbind.so ]; then cp -fp nsswitch/pam_winbind.so $TMPINSTALLDIR/$LIBDIR/pam_winbind.so @@ -198,6 +202,7 @@ done ## echo "CONFIGDIR=$CONFIGDIR" >> pkginfo echo "LOGFILEBASE=$LOGFILEBASE" >> pkginfo +echo "LOCKDIR=$LOCKDIR" >> pkginfo echo "PIDDIR=$PIDDIR" >> pkginfo echo "PRIVATE_DIR=$PRIVATE_DIR" >> pkginfo diff --git a/packaging/Solaris/pkginfo.master b/packaging/Solaris/pkginfo.master index 2ab201dae9..a40c76e60f 100644 --- a/packaging/Solaris/pkginfo.master +++ b/packaging/Solaris/pkginfo.master @@ -8,5 +8,7 @@ DESC=File and printer sharing for Windows workstations HOTLINE=Please contact your local UNIX support group EMAIL=jerry@samba.org CLASSES=none -BASEDIR=__BASEDIR__ INTONLY=1 +ISTATES="S s 1 2 3" +RSTATES="S s 1 2 3" +BASEDIR=__BASEDIR__ diff --git a/packaging/Solaris/prototype.master b/packaging/Solaris/prototype.master index 67dd3eb0fd..6cf1cc717d 100644 --- a/packaging/Solaris/prototype.master +++ b/packaging/Solaris/prototype.master @@ -15,6 +15,7 @@ d none $CONFIGDIR ? ? ? d initscript /etc/init.d ? ? ? f initscript /etc/init.d/samba=scripts/samba.init 0744 root sys d initscript /etc/rc3.d ? ? ? +f initscript /sbin/samba=scripts/samba.init 0750 root root # # Stuff to set up SWAT # @@ -27,6 +28,7 @@ e swat /etc/inet/inetd.conf=scripts/inetd.conf ? ? ? d none docs 755 root other d none man 755 root other d none $CONFIGDIR 755 root sys +d none $LOCKDIR 755 root other d none $PRIVATE_DIR 700 root sys d none sbin 0755 root other d none bin 0755 root other diff --git a/packaging/Solaris/samba.init.master b/packaging/Solaris/samba.init.master index d8bea2421c..61e222bd20 100755 --- a/packaging/Solaris/samba.init.master +++ b/packaging/Solaris/samba.init.master @@ -24,10 +24,14 @@ case "$1" in 'start') # # Edit these lines to suit your installation (paths, workgroup, host) +# Add the following parameters to nmbd, smbd, winbindd if needed +# (this may be needed for custom file locations) +# -D -s$BASE/lib/smb.conf # - BASE=__BASEDIR__/samba - $BASE/bin/smbd -D -s$BASE/lib/smb.conf - $BASE/bin/nmbd -D -s$BASE/lib/smb.conf + BASE=__BASEDIR__ + $BASE/sbin/nmbd + $BASE/sbin/smbd + $BASE/sbin/winbindd ;; 'stop') killproc nmbd @@ -37,12 +41,13 @@ case "$1" in 'restart') killproc nmbd killproc smbd - BASE=__BASEDIR__/samba - $BASE/bin/smbd -D -s$BASE/lib/smb.conf - $BASE/bin/nmbd -D -l$BASE/var/log -s$BASE/lib/smb.conf + BASE=__BASEDIR__ + $BASE/sbin/nmbd + $BASE/sbin/smbd + $BASE/sbin/winbindd ;; *) - echo "Usage: /etc/init.d/samba.server { start | stop | restart }" + echo "Usage: /etc/init.d/samba { start | stop | restart }" ;; esac |