Initial: Removed SystemD, Added OpenRC

11 files changed, 71 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9a9710ec86bf..028f365a68c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
-pkgbase = vmware-workstation
-	pkgdesc = The industry standard for running multiple operating systems as virtual machines on a single Linux PC.
+pkgbase = vmware-workstation-openrc
+	pkgdesc = The industry standard for running multiple operating systems as virtual machines on a single Linux PC. Modified to use OpenRC.
 	pkgver = 16.1.1
 	pkgrel = 1
 	url = https://www.vmware.com/products/workstation-for-linux.html
@@ -23,6 +23,7 @@ pkgbase = vmware-workstation
 	conflicts = vmware-ovftool
 	conflicts = vmware-patch
 	conflicts = vmware-systemd-services
+	conflicts = vmware-workstation
 	options = !strip
 	options = emptydirs
 	backup = etc/vmware/config
@@ -33,26 +34,26 @@ pkgbase = vmware-workstation
 	source = config
 	source = configure-initscript.sh
 	source = vmware-environment.sh
-	source = vmware-networks-configuration.service
-	source = vmware-networks.service
-	source = vmware-usbarbitrator.service
+	source = vmware-networks-configuration
+	source = vmware-networks
+	source = vmware-usbarbitrator
 	source = dkms.conf.in
 	source = Makefile
 	source = vmmon.patch
 	source = vmnet.patch
 	sha256sums = 62e1b91bf580e05ddc14a1cc52589731291a4262fa1dca956d23e4c60ce013a5
-	sha256sums = 12e7b16abf8d7e858532edabb8868919c678063c566a6535855b194aac72d55e
+	sha256sums = 67edc40e39686281f5101ced1a250648ae32e4cd5dffe4fd47bc3c7aed929d50
 	sha256sums = da1698bf4e73ae466c1c7fc93891eba4b9c4581856649635e6532275dbfea141
-	sha256sums = bfd2aa7d85d9fd029b8bc59072d5102458a21a9b03b1c835ac4901e0787c09f5
-	sha256sums = 48d203450db426e8780f3696a2cf85ee08db004e93f8aca50a9aa24129b1e839
+	sha256sums = 83a9daa713e0a419367b9702f0be8bdeb79fd16214daf6e8f5954043e8720ab8
+	sha256sums = f2c9272dfa1e3de1de5f5545989e6e3d9f400084decaa5504559a20209648329
 	sha256sums = b94959a11b28e51b541321be0588190eb10825e9ff55cbd16eb01483a839a69f
-	sha256sums = 9b4fbe0ba83f761a2eb9ecd05d48428f8b0a5b3abd8404ccbd928408e682f02b
-	sha256sums = c0a5aea785db06921fb350d36d5e0fd9a14f5eee0c835686ec6fea1af8c92245
-	sha256sums = d7a9fbf39a0345ae2f14f7f389f30b1110f605d187e0c241e99bbb18993c250d
+	sha256sums = 7e1109296ccd60dc25ddfb8e57edc2833296f7849a7f7ea9187cef06ad4ac0d8
+	sha256sums = 1c418ebb87e8cc06ceea1f6ca366660ff3253f11fa2e1c13b2e9d696be63ef37
+	sha256sums = 452c1bfebac52f4808ba5f4bf2fc3eae9858f8745d60c13d3c46e7550a3e1eb1
 	sha256sums = 10562d11d50edab9abc2b29c8948714edcb9b084f99b3766d07ddd21259e372e
 	sha256sums = 273d4357599a3e54259c78cc49054fef8ecfd2c2eda35cbcde3a53a62777a5ac
 	sha256sums = 1060b5d45caeda5119b220fab4e1ece398af34d75131139a5dc6f74ee06672c3
 	sha256sums = 7c3b6a7871b19e31fafdcc2631751dd9569196740d8e7c2026653d155c0c8da0
 
-pkgname = vmware-workstation
+pkgname = vmware-workstation-openrc
 
diff --git a/PKGBUILD b/PKGBUILD
index 553d33648145..6059b5a9948b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Jean-Marc Lenoir <archlinux "at" jihemel "dot" com>
+# Maintainer: randomnobody <nobody "at" 420blaze "dot" it>
+# Contributor: Jean-Marc Lenoir <archlinux "at" jihemel "dot" com>
 # Contributor: Maxwell Pray a.k.a. Synthead <synthead@gmail.com>
 
 # To enable macOS guests support, uncomment the line below:
@@ -13,12 +14,12 @@
 #_remove_vmware_keymaps_dependency=y
 
 #PKGEXT=.pkg.tar
-pkgname=vmware-workstation
+pkgname=vmware-workstation-openrc
 pkgver=16.1.1
 _buildver=17801498
 _pkgver=${pkgver}_${_buildver}
 pkgrel=1
-pkgdesc='The industry standard for running multiple operating systems as virtual machines on a single Linux PC.'
+pkgdesc='The industry standard for running multiple operating systems as virtual machines on a single Linux PC. Modified to use OpenRC.'
 arch=(x86_64)
 url='https://www.vmware.com/products/workstation-for-linux.html'
 license=(custom)
@@ -28,6 +29,7 @@ conflicts=(
   vmware-ovftool
   vmware-patch
   vmware-systemd-services
+  vmware-workstation
 )
 provides=(
   vmware-ovftool
@@ -63,9 +65,9 @@ source=(
   'configure-initscript.sh'
   'vmware-environment.sh'
 
-  'vmware-networks-configuration.service'
-  'vmware-networks.service'
-  'vmware-usbarbitrator.service'
+  'vmware-networks-configuration'
+  'vmware-networks'
+  'vmware-usbarbitrator'
 
   'dkms.conf.in'
   'Makefile'
@@ -75,15 +77,15 @@ source=(
 sha256sums=(
   '62e1b91bf580e05ddc14a1cc52589731291a4262fa1dca956d23e4c60ce013a5'
 
-  '12e7b16abf8d7e858532edabb8868919c678063c566a6535855b194aac72d55e'
+  '67edc40e39686281f5101ced1a250648ae32e4cd5dffe4fd47bc3c7aed929d50'
   'da1698bf4e73ae466c1c7fc93891eba4b9c4581856649635e6532275dbfea141'
-  'bfd2aa7d85d9fd029b8bc59072d5102458a21a9b03b1c835ac4901e0787c09f5'
-  '48d203450db426e8780f3696a2cf85ee08db004e93f8aca50a9aa24129b1e839'
+  '83a9daa713e0a419367b9702f0be8bdeb79fd16214daf6e8f5954043e8720ab8'
+  'f2c9272dfa1e3de1de5f5545989e6e3d9f400084decaa5504559a20209648329'
   'b94959a11b28e51b541321be0588190eb10825e9ff55cbd16eb01483a839a69f'
 
-  '9b4fbe0ba83f761a2eb9ecd05d48428f8b0a5b3abd8404ccbd928408e682f02b'
-  'c0a5aea785db06921fb350d36d5e0fd9a14f5eee0c835686ec6fea1af8c92245'
-  'd7a9fbf39a0345ae2f14f7f389f30b1110f605d187e0c241e99bbb18993c250d'
+  '7e1109296ccd60dc25ddfb8e57edc2833296f7849a7f7ea9187cef06ad4ac0d8'
+  '1c418ebb87e8cc06ceea1f6ca366660ff3253f11fa2e1c13b2e9d696be63ef37'
+  '452c1bfebac52f4808ba5f4bf2fc3eae9858f8745d60c13d3c46e7550a3e1eb1'
 
   '10562d11d50edab9abc2b29c8948714edcb9b084f99b3766d07ddd21259e372e'
   '273d4357599a3e54259c78cc49054fef8ecfd2c2eda35cbcde3a53a62777a5ac'
@@ -281,13 +283,13 @@ fi
   echo -e "vmw_vmci\nvmmon" > "$pkgdir/usr/lib/modules-load.d/vmware.conf"
 
   for service_file in \
-    vmware-networks-configuration.service \
-    vmware-networks.service \
-    vmware-usbarbitrator.service
+    vmware-networks-configuration \
+    vmware-networks \
+    vmware-usbarbitrator
   do
-    install -Dm 644 \
+    install -Dm 755 \
       "$srcdir/$service_file" \
-      "$pkgdir/usr/lib/systemd/system/$service_file"
+      "$pkgdir/etc/init.d/$service_file"
   done
 
 
diff --git a/config b/config
index c33afae3fbb8..d66fb83c2773 100644
--- a/config
+++ b/config
@@ -8,7 +8,7 @@ vix.config.version = "1"
 bindir = "/usr/bin"
 libdir = "/usr/lib/vmware"
 vix.libdir = "/usr/lib/vmware-vix"
-initscriptdir = "/usr/lib/systemd/scripts"
+initscriptdir = "/etc/init.d"
 vmware.fullpath = "/usr/bin/vmware"
 authd.fullpath = "/usr/bin/vmware-authd"
 gksu.rootMethod = "su"
diff --git a/configure-initscript.sh b/configure-initscript.sh
index 8fe7eb16ea73..a0744156e5ee 100755
--- a/configure-initscript.sh
+++ b/configure-initscript.sh
@@ -13,15 +13,15 @@ stopLevel="$4"
 
 addService() {
    if [ "$serviceName" != "vmware" ]; then
-      systemctl start $serviceName.service
-      systemctl enable $serviceName.service
+      rc-service $serviceName start
+      rc-update add $serviceName default
    fi
 }
 
 removeService() {
    if [ "$serviceName" != "vmware" ]; then
-      systemctl stop $serviceName.service
-      systemctl disable $serviceName.service
+      rc-service $serviceName stop
+      rc-update delete $serviceName default
    fi
 }
 
@@ -30,7 +30,7 @@ checkService() {
    if [ "$serviceName" = "vmware" ]; then
       retval=0
    else
-      systemctl is-active $serviceName.service > /dev/null
+      rc-service $serviceName status > /dev/null
       retval=$?
    fi
 
diff --git a/vmware-bootstrap b/vmware-bootstrap
index 981b82191cca..2abeeba254ae 100644
--- a/vmware-bootstrap
+++ b/vmware-bootstrap
@@ -8,4 +8,4 @@ DOCDIR="/usr/share/doc"
 MANDIR="/usr/share/man"
 INCLUDEDIR="/usr/include"
 INITDIR=""
-INITSCRIPTDIR="/usr/lib/systemd/scripts"
+INITSCRIPTDIR="/etc/init.d"
diff --git a/vmware-networks b/vmware-networks
new file mode 100755
index 000000000000..881e0b1852c5
--- /dev/null
+++ b/vmware-networks
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+
+name=$RC_SVCNAME
+description="VMware Networks"
+command="/usr/bin/vmware-networks"
+command_args="--start"
+pidfile="undefined"
+
+depend() {
+	after vmware-networks-configuration
+	use vmware-networks-configuration
+}
+
+stop() {
+	ebegin "Stopping $RC_SVCNAME"
+	/usr/bin/vmware-networks --stop
+	eend $?
+}
diff --git a/vmware-networks-configuration b/vmware-networks-configuration
new file mode 100755
index 000000000000..06699a5c6735
--- /dev/null
+++ b/vmware-networks-configuration
@@ -0,0 +1,7 @@
+#!/sbin/openrc-run
+
+name=$RC_SVCNAME
+description="VMware Networks Configuration Generation"
+command="/usr/bin/vmware-networks"
+command_args="--postinstall vmware-player,0,1"
+start_stop_daemon_args=" -k 0077"
diff --git a/vmware-networks-configuration.service b/vmware-networks-configuration.service
deleted file mode 100644
index 0d86867f955e..000000000000
--- a/vmware-networks-configuration.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=VMware Networks Configuration Generation
-ConditionPathExists=!/etc/vmware/networking
-
-[Service]
-UMask=0077
-ExecStart=/usr/bin/vmware-networks --postinstall vmware-player,0,1
-Type=oneshot
-RemainAfterExit=yes
diff --git a/vmware-networks.service b/vmware-networks.service
deleted file mode 100644
index 7d520a28a88d..000000000000
--- a/vmware-networks.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=VMware Networks
-Wants=vmware-networks-configuration.service
-After=vmware-networks-configuration.service
-
-[Service]
-Type=forking
-ExecStartPre=-/sbin/modprobe vmnet
-ExecStart=/usr/bin/vmware-networks --start
-ExecStop=/usr/bin/vmware-networks --stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/vmware-usbarbitrator b/vmware-usbarbitrator
new file mode 100755
index 000000000000..f70967671337
--- /dev/null
+++ b/vmware-usbarbitrator
@@ -0,0 +1,7 @@
+#!/sbin/openrc-run
+
+name=$RC_SVCNAME
+description="VMware USB Arbitrator"
+supervisor="supervise-daemon"
+command="/usr/lib/vmware/bin/vmware-usbarbitrator"
+command_args="-f"
diff --git a/vmware-usbarbitrator.service b/vmware-usbarbitrator.service
deleted file mode 100644
index fd1d9cac8034..000000000000
--- a/vmware-usbarbitrator.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=VMware USB Arbitrator
-
-[Service]
-ExecStart=/usr/lib/vmware/bin/vmware-usbarbitrator -f
-
-[Install]
-WantedBy=multi-user.target