| 1 |
ikelos 07/09/16 15:36:52 |
| 2 |
|
| 3 |
Modified: vmware-authd vmware-server.rc |
| 4 |
Log: |
| 5 |
Fix up PAM issues on amd64, add vmware-modules blockers and fix init script for baselayout-2 and dash. |
| 6 |
(Portage version: 2.1.3.9) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 app-emulation/vmware-server/files/vmware-authd |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-server/files/vmware-authd?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-server/files/vmware-authd?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-server/files/vmware-authd?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: vmware-authd |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/files/vmware-authd,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- vmware-authd 31 Jul 2006 20:23:50 -0000 1.1 |
| 22 |
+++ vmware-authd 16 Sep 2007 15:36:51 -0000 1.2 |
| 23 |
@@ -1,6 +1,4 @@ |
| 24 |
#%PAM-1.0 |
| 25 |
-auth sufficient pam_unix.so shadow nullok |
| 26 |
-auth required pam_unix_auth.so shadow nullok |
| 27 |
+auth required pam_unix.so shadow nullok |
| 28 |
account required pam_listfile.so item=group sense=allow file=/etc/vmware/vmwaregroup onerr=fail |
| 29 |
-account sufficient pam_unix.so |
| 30 |
-account required pam_unix_acct.so |
| 31 |
+account required pam_unix.so |
| 32 |
|
| 33 |
|
| 34 |
|
| 35 |
1.5 app-emulation/vmware-server/files/vmware-server.rc |
| 36 |
|
| 37 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-server/files/vmware-server.rc?rev=1.5&view=markup |
| 38 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-server/files/vmware-server.rc?rev=1.5&content-type=text/plain |
| 39 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-server/files/vmware-server.rc?r1=1.4&r2=1.5 |
| 40 |
|
| 41 |
Index: vmware-server.rc |
| 42 |
=================================================================== |
| 43 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/files/vmware-server.rc,v |
| 44 |
retrieving revision 1.4 |
| 45 |
retrieving revision 1.5 |
| 46 |
diff -u -r1.4 -r1.5 |
| 47 |
--- vmware-server.rc 28 Apr 2007 10:00:58 -0000 1.4 |
| 48 |
+++ vmware-server.rc 16 Sep 2007 15:36:51 -0000 1.5 |
| 49 |
@@ -1,7 +1,7 @@ |
| 50 |
#!/sbin/runscript |
| 51 |
# Copyright 1999-2004 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/files/vmware-server.rc,v 1.4 2007/04/28 10:00:58 ikelos Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/files/vmware-server.rc,v 1.5 2007/09/16 15:36:51 ikelos Exp $ |
| 55 |
|
| 56 |
depend() { |
| 57 |
need localmount xinetd |
| 58 |
@@ -16,28 +16,28 @@ |
| 59 |
msgtype=0 |
| 60 |
while read line |
| 61 |
do |
| 62 |
- [[ "${line}" == "" ]] && continue |
| 63 |
- if [[ "${msgtype}" -le "0" ]] |
| 64 |
+ [ "$line" = "" ] && continue |
| 65 |
+ if [ ${msgtype} -le 0 ] |
| 66 |
then |
| 67 |
- if [[ "${msgtype}" == "-1" ]] |
| 68 |
+ if [ ${msgtype} -eq -1 ] |
| 69 |
then |
| 70 |
- ewarn ${line} |
| 71 |
+ ewarn $line |
| 72 |
continue |
| 73 |
fi |
| 74 |
- if [[ "${line/*:*/}" == "" ]] |
| 75 |
+ if echo ${line} | fgrep -q : |
| 76 |
then |
| 77 |
- einfon ${line} |
| 78 |
+ einfon $line |
| 79 |
echo |
| 80 |
eend 0 |
| 81 |
msgtype=1 |
| 82 |
- elif [ "${line/*Stopping VMware virtual machines*/}" == "" ] |
| 83 |
+ elif echo $line | grep -q "Stopping VMware virtual machines" |
| 84 |
then |
| 85 |
einfon $line |
| 86 |
echo |
| 87 |
eend 0 |
| 88 |
msgtype=0 |
| 89 |
else |
| 90 |
- ewarn ${line} |
| 91 |
+ ewarn $line |
| 92 |
msgtype=-1 |
| 93 |
waserror=1 |
| 94 |
fi |
| 95 |
@@ -45,25 +45,25 @@ |
| 96 |
fi |
| 97 |
|
| 98 |
# Strip out anything after the <esc> code |
| 99 |
- message=`echo ${line} | sed -e "s/^\(.*\).*$/\1/"` |
| 100 |
- einfon " ${message}" |
| 101 |
+ message=`echo $line | sed -e "s/^\(.*\).*$/\1/"` |
| 102 |
+ einfon " $message" |
| 103 |
echo |
| 104 |
|
| 105 |
- echo ${line} | grep done > /dev/null |
| 106 |
+ echo ${line} | grep -q done |
| 107 |
status=$? |
| 108 |
- eend ${status} |
| 109 |
+ eend $status |
| 110 |
|
| 111 |
- if [[ "${status}" != "0" ]] |
| 112 |
+ if [ $status -eq 0 ] |
| 113 |
then |
| 114 |
- logger -p local0.err -t vmware-${state} "${line}" |
| 115 |
- waserror=${status} |
| 116 |
+ logger -p local0.err -t vmware-${state} "$line" |
| 117 |
+ waserror=$status |
| 118 |
fi |
| 119 |
done |
| 120 |
- if [[ "${msgtype}" == "-1" ]] |
| 121 |
+ if [ "$msgtype" = "-1" ] |
| 122 |
then |
| 123 |
eend 1 "VMware is not properly configured! See above." |
| 124 |
fi |
| 125 |
- return ${waserror} |
| 126 |
+ return $waserror |
| 127 |
} |
| 128 |
|
| 129 |
start() { |
| 130 |
|
| 131 |
|
| 132 |
|
| 133 |
-- |
| 134 |
gentoo-commits@g.o mailing list |
Archives