From 7e4ec0a6a9ecb96b0f8a8364e19f465f9dca29ee Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sat, 2 May 2020 00:21:23 +0200
Subject: [PATCH] Revert "docker: Use OPTS="-s=overlay2" in case OPTS is not
 set"

This reverts commit 5c212702efaeef7d2334952bd7d0d20ac49c96c8.

Closes #21254
---
 srcpkgs/docker/files/docker/run | 1 -
 srcpkgs/docker/template         | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker/files/docker/run
index 9922e2f6196..ed42f5fa72f 100755
--- a/srcpkgs/docker/files/docker/run
+++ b/srcpkgs/docker/files/docker/run
@@ -5,5 +5,4 @@ mountpoint -q /sys/fs/cgroup/systemd || {
     mkdir -p /sys/fs/cgroup/systemd;
     mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
 }
-[ -n "$OPTS" ] || OPTS="-s=overlay2"
 exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 0e0021c09b5..e9a226eb4ff 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,7 +1,7 @@
 # Template file for 'docker'
 pkgname=docker
 version=19.03.8
-revision=1
+revision=2
 wrksrc="${pkgname}-ce-${version}"
 hostmakedepends="git go pkg-config curl cmake tar"
 makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
@@ -42,7 +42,7 @@ do_build() {
 pre_build() {
 	cd components/engine
 	vmkdir usr/bin
-	sed -i "s|/usr/local|$DESTDIR/usr|g" hack/dockerfile/install/install.sh
+	vsed -i "s|/usr/local|$DESTDIR/usr|g" hack/dockerfile/install/install.sh
 	for COMPONENT in $_docker_components; do
 		AUTO_GOPATH=1 LDFLAGS='' DOCKER_BUILDTAGS='seccomp apparmor' DOCKER_GITCOMMIT=v${version} \
 			hack/dockerfile/install/install.sh $COMPONENT