Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=facceac8e0357dc20d9decd3c2ff1378fad331f5

commit facceac8e0357dc20d9decd3c2ff1378fad331f5
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date:   Wed Feb 27 00:32:19 2008 +0100

wine-0.9.56-1-i686
- no relbump yet
- rc.wine: cleanup, we no longer have to mount anything manually. also added
status command

diff --git a/source/xapps/wine/FrugalBuild b/source/xapps/wine/FrugalBuild
index bf1f53d..1350e2e 100644
--- a/source/xapps/wine/FrugalBuild
+++ b/source/xapps/wine/FrugalBuild
@@ -31,7 +31,7 @@ build()
}

sha1sums=('ef40fc70356394e570e48506c67c398abe4b509c' \
-          'a9c70a49cef90cf60c2e90e63753858387f7117a' \
+          '95dc7fe8cc22452419ec7321da24465270bf3b3f' \
'd014c926facb1cf4a2f025d6b92e5a0b25a19f3e' \
'8b0f7b52885c8d78ba3096a16e9caff60ffe624f')
# optimization OK
diff --git a/source/xapps/wine/rc.wine b/source/xapps/wine/rc.wine
index 51caa00..9e3c78f 100644
--- a/source/xapps/wine/rc.wine
+++ b/source/xapps/wine/rc.wine
@@ -18,31 +18,36 @@ daemon=$"WINE"
rc_start()
{
start_msg
-       retval=0
-       if [ ! -e /proc/sys/fs/binfmt_misc ] ; then
-               modprobe binfmt_misc
-               retval=$?
+       if ls /proc/sys/fs/binfmt_misc/windows* &>/dev/null; then
+               ok 999
+               return 1
fi
-       if [ ! -e /proc/sys/fs/binfmt_misc/register ] && (( $retval == 0 )) ; 
then
-               mount -t binfmt_misc none /proc/sys/fs/binfmt_misc
-               retval=$?
-       fi
-       if (( $retval == 0 )) ; then
-               echo ':windowsPE:M::PE::/usr/bin/wine:' 
>/proc/sys/fs/binfmt_misc/register
-               echo ':windows:M::MZ::/usr/bin/wine:' 
>/proc/sys/fs/binfmt_misc/register
-               retval=$?
+       modprobe binfmt_misc
+       echo ':windowsPE:M::PE::/usr/bin/wine:' 
>/proc/sys/fs/binfmt_misc/register
+       echo ':windows:M::MZ::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register
+       ok $?
+}
+
+rc_status()
+{
+       status_msg $"Wine binary format handlers are"
+       if ! ls /proc/sys/fs/binfmt_misc/windows* &>/dev/null; then
+               ok 998
+       else
+               ok 997
fi
-       ok $retval
}

rc_stop()
{
stop_msg
+       if ! ls /proc/sys/fs/binfmt_misc/windows &>/dev/null; then
+               ok 999
+               return 1
+       fi
echo "-1" >/proc/sys/fs/binfmt_misc/windows
echo "-1" >/proc/sys/fs/binfmt_misc/windowsPE
ok $?
}

rc_exec $1
-
-# vim: ft=sh
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to