Skip to content

Commit 1921801

Browse files
committed
disable minikube-scheduled-stop.service until a user schedules a stop
1 parent 413cdf6 commit 1921801

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

deploy/iso/minikube-iso/package/scheduled-stop/scheduled-stop.mk

-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ define SCHEDULED_STOP_INSTALL_INIT_SYSTEMD
88
$(INSTALL) -D -m 644 \
99
$(SCHEDULED_STOP_PKGDIR)/minikube-scheduled-stop.service \
1010
$(TARGET_DIR)/usr/lib/systemd/system/minikube-scheduled-stop.service
11-
12-
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
13-
ln -fs /usr/lib/systemd/system/minikube-scheduled-stop.service \
14-
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/minikube-scheduled-stop.service
1511
endef
1612

1713
define SCHEDULED_STOP_INSTALL_TARGET_CMDS

deploy/kicbase/Dockerfile

+1-3
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,7 @@ RUN ln -fs /usr/lib/systemd/system/minikube-automount.service \
155155
# scheduled stop service
156156
COPY scheduled-stop/minikube-scheduled-stop /var/lib/minikube/scheduled-stop/minikube-scheduled-stop
157157
COPY scheduled-stop/minikube-scheduled-stop.service /usr/lib/systemd/system/minikube-scheduled-stop.service
158-
RUN ln -fs /usr/lib/systemd/system/minikube-scheduled-stop.service \
159-
/etc/systemd/system/multi-user.target.wants/minikube-scheduled-stop.service && \
160-
chmod +x /var/lib/minikube/scheduled-stop/minikube-scheduled-stop
158+
RUN chmod +x /var/lib/minikube/scheduled-stop/minikube-scheduled-stop
161159

162160
# disable non-docker runtimes by default
163161
RUN systemctl disable containerd && systemctl disable crio && rm /etc/crictl.yaml

pkg/minikube/schedule/daemonize_windows.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,12 @@ func startSystemdService(profile string, duration time.Duration) error {
100100
return errors.Wrap(err, "copying scheduled stop env file")
101101
}
102102
// restart scheduled stop service in container
103-
sysManger := sysinit.New(runner)
104-
return sysManger.Restart(constants.ScheduledStopSystemdService)
103+
sysManager := sysinit.New(runner)
104+
// enable scheduled stop service
105+
if err := sysManager.Enable(constants.ScheduledStopSystemdService); err != nil {
106+
return err
107+
}
108+
return sysManager.Restart(constants.ScheduledStopSystemdService)
105109
}
106110

107111
// return the contents of the environment file for minikube-scheduled-stop systemd service

0 commit comments

Comments
 (0)