From 0414f97c780e5d9dc72f8cdc54efd5e420efe626 Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Mon, 4 Mar 2019 13:18:20 -0700
Subject: [PATCH] Revert "Enable systemd ready notification for k3s server"

This reverts commit c73e9187bb5ffcf251cbbdcdb4e11c104eeffc69.
---
 README.md                | 1 -
 install.sh               | 1 -
 k3s.service              | 1 -
 pkg/cli/server/server.go | 4 ----
 4 files changed, 7 deletions(-)

diff --git a/README.md b/README.md
index 8086be61bf..ea7bb8dad1 100644
--- a/README.md
+++ b/README.md
@@ -205,7 +205,6 @@ Documentation=https://k3s.io
 After=network.target
 
 [Service]
-Type=notify
 ExecStartPre=-/sbin/modprobe br_netfilter
 ExecStartPre=-/sbin/modprobe overlay
 ExecStart=/usr/local/bin/k3s server
diff --git a/install.sh b/install.sh
index 8fc19d553b..dcf268b7e6 100755
--- a/install.sh
+++ b/install.sh
@@ -139,7 +139,6 @@ Documentation=https://k3s.io
 After=network.target
 
 [Service]
-Type=notify
 ExecStartPre=-/sbin/modprobe br_netfilter
 ExecStartPre=-/sbin/modprobe overlay
 ExecStart=/usr/local/bin/k3s server
diff --git a/k3s.service b/k3s.service
index cc74fc98aa..822ae13bbc 100644
--- a/k3s.service
+++ b/k3s.service
@@ -4,7 +4,6 @@ Documentation=https://k3s.io
 After=network.target
 
 [Service]
-Type=notify
 ExecStartPre=-/sbin/modprobe br_netfilter
 ExecStartPre=-/sbin/modprobe overlay
 ExecStart=/usr/local/bin/k3s server
diff --git a/pkg/cli/server/server.go b/pkg/cli/server/server.go
index e9659bd74e..721f124c76 100644
--- a/pkg/cli/server/server.go
+++ b/pkg/cli/server/server.go
@@ -9,7 +9,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	systemd "github.com/coreos/go-systemd/daemon"
 	"github.com/docker/docker/pkg/reexec"
 	"github.com/natefinch/lumberjack"
 	"github.com/pkg/errors"
@@ -20,7 +19,6 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 	"k8s.io/apimachinery/pkg/util/net"
-	genericapiserver "k8s.io/apiserver/pkg/server"
 
 	_ "github.com/mattn/go-sqlite3" // ensure we have sqlite
 )
@@ -53,7 +51,6 @@ func runWithLogging(app *cli.Context, cfg *cmds.Server) error {
 }
 
 func Run(app *cli.Context) error {
-	genericapiserver.NotifySystemD = false
 	return run(app, &cmds.ServerConfig)
 }
 
@@ -109,7 +106,6 @@ func run(app *cli.Context, cfg *cmds.Server) error {
 	}
 
 	logrus.Info("k3s is up and running")
-	go systemd.SdNotify(false, "READY=1")
 
 	if cfg.DisableAgent {
 		<-ctx.Done()