sync with 2.0 tree

(This used to be commit 44d962b73634c3e43973b35c1f02aaff6edc5981)

3 files changed, 34 insertions, 1 deletions

diff --git a/packaging/SGI/idb.pl b/packaging/SGI/idb.pl
index 08c95e2ed3..cc44627273 100755
--- a/packaging/SGI/idb.pl
+++ b/packaging/SGI/idb.pl
@@ -115,7 +115,7 @@ while(@bins) {
       print IDB "f 0755 root sys usr/samba/bin/$filename packaging/SGI/$filename samba.sw.base\n";
     }
     elsif ($filename eq "swat") {
-      print IDB "f 4755 root sys usr/samba/bin/$filename source/$nextfile samba.sw.base nostrip preop(/etc/killall smbd nmbd) exitop(/usr/samba/scripts/startswat.sh) removeop(/usr/samba/scripts/removeswat.sh)\n";
+      print IDB "f 4755 root sys usr/samba/bin/$filename source/$nextfile samba.sw.base nostrip preop(\"chroot \$rbase /etc/init.d/samba stop\") exitop(\"chroot \$rbase /usr/samba/scripts/startswat.sh\") removeop(\"chroot \$rbase /sbin/cp /etc/inetd.conf /etc/inetd.conf.O ; chroot \$rbase /sbin/sed -e '/^swat/D' -e '/^#SWAT/D' /etc/inetd.conf.O >/etc/inetd.conf; /etc/killall -HUP inetd || true\")\n";
     }
     elsif ($filename eq "sambalp") {
       print IDB "f 0755 root sys usr/samba/bin/$filename packaging/SGI/$filename samba.sw.base nostrip\n";
@@ -159,6 +159,7 @@ print IDB "f 0600 root sys usr/samba/private/smbpasswd packaging/SGI/smbpasswd s
 
 print IDB "d 0755 root sys usr/samba/scripts packaging/SGI samba.src.samba\n";
 print IDB "f 0755 root sys usr/samba/scripts/inetd.sh packaging/SGI/inetd.sh samba.sw.base\n";
+print IDB "f 0755 root sys usr/samba/scripts/inst.msg packaging/SGI/inst.msg samba.sw.base exitop(\"chroot \$rbase /usr/samba/scripts/inst.msg\")\n";
 print IDB "f 0755 root sys usr/samba/scripts/mkprintcap.sh packaging/SGI/mkprintcap.sh samba.sw.base\n";
 print IDB "f 0755 root sys usr/samba/scripts/removeswat.sh packaging/SGI/removeswat.sh samba.sw.base\n";
 print IDB "f 0755 root sys usr/samba/scripts/startswat.sh packaging/SGI/startswat.sh samba.sw.base\n";
diff --git a/packaging/SGI/inst.msg b/packaging/SGI/inst.msg
new file mode 100755
index 0000000000..c613a09d01
--- /dev/null
+++ b/packaging/SGI/inst.msg
@@ -0,0 +1,31 @@
+#! /bin/sh
+
+echo
+echo
+echo Samba for IRIX has been installed on your system.
+echo 
+echo Your /etc/services and /etc/inetd.conf files have
+echo been modified to automatically start the
+echo Samba Web Administration Tool \(SWAT\) when you 
+echo connect with a web browser to
+echo 
+echo http://`hostname`:901
+echo 
+echo The original versions of /etc/services and
+echo /etc/inetd.conf were saved echo with a .O extension.
+echo
+echo If you do not wish SWAT to be enabled you may
+echo run the script /usr/samba/scripts/removeswat.sh
+echo which will remove the entries from /etc/services
+echo and /etc/inetd.conf
+echo 
+echo Please review your configuration settings by
+echo connecting to SWAT or editing the file
+echo /usr/samba/lib/smb.conf and then starting
+echo the smbd and nmbd daemons to complete the 
+echo installation. You may start the daemons from
+echo the SWAT "Status" page or by executing the
+echo following command as root.
+echo 
+echo /etc/init.d/samba start
+echo
diff --git a/packaging/SGI/samba.rc b/packaging/SGI/samba.rc
index 121b3400a3..bc0f90ee77 100644
--- a/packaging/SGI/samba.rc
+++ b/packaging/SGI/samba.rc
@@ -35,6 +35,7 @@ case $1 in
 'stop')
 	$ECHO "Stopping Samba Servers."
 	$KILLALL -15 smbd nmbd
+	exit 0
 	;;
 *)
 	echo "usage: /etc/init.d/samba {start|stop}"