--- a/usr/src/cmd/quagga/post-install.sh	Tue Jun 18 19:16:48 2013 +0100
+++ b/usr/src/cmd/quagga/post-install.sh	Tue Jun 18 19:17:37 2013 +0100
@@ -19,9 +19,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)post-install.sh	1.8	10/04/22 SMI"
+# ident	"@(#)post-install.sh	1.9	11/03/10 SMI"
 #
 # Handle various things where the files installed by Quagga's 'make install'
 # differ from what we need for the SFW packages. E.g.:
@@ -73,7 +73,7 @@
 	"usr/sfw/include/quagga/*.h" \
 	"usr/sfw/include/quagga/ospfd/*.h" \
 	"usr/sfw/include/quagga/ospfapi/*.h" ; do
-	rm -- ${ROOT}/${H}
+	rm -f -- ${ROOT}/${H}
 done
 
 for H in quagga/ospfd quagga/ospfapi quagga ; do
@@ -95,7 +95,6 @@
 _install N ../Solaris/quaggaadm.1m ${ROOT}/usr/sfw/share/man/man1m/quaggaadm.1m 444
 _install N ../Solaris/README.Solaris ${ROOT}/etc/quagga/README.Solaris 644
 _install N ../Solaris/ospfd.HA.conf.sample ${ROOT}/etc/quagga/ospfd.HA.conf.sample 644
-_install N ../../../common/rbac/exec_attr ${ROOT}/etc/security/exec_attr 644
 _install S ../Solaris/quaggaadm ${ROOT}/usr/sbin/quaggaadm 555
 _install L quaggaadm ${ROOT}/usr/sbin/zebraadm
 _install N solaris/quagga.xml ${ROOT}/lib/svc/manifest/network/routing/quagga.xml 444
@@ -104,4 +103,4 @@
 _install N ${SRCDIR}/doc/quagga.info-1 ${ROOT}/usr/sfw/share/info/quagga.info 444
 
 # rm the make-install'd quagga.info-1
-rm ${ROOT}/usr/sfw/share/info/quagga.info-1
+rm -f ${ROOT}/usr/sfw/share/info/quagga.info-1