Skip to content

Commit 9502968

Browse files
Demian Ginthercarmstrong
authored andcommitted
fix(contrib): #859 remove update manager stop commands from Vagrantfile
1 parent 65f8eff commit 9502968

2 files changed

Lines changed: 20 additions & 4 deletions

File tree

Vagrantfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ Vagrant.configure("2") do |config|
4747
# Enable NFS for sharing the host machine into the coreos-vagrant VM.
4848
config.vm.synced_folder ".", "/home/core/share", id: "core", :nfs => true, :mount_options => ['nolock,vers=3,udp']
4949

50-
# disable update-engine to prevent reboots
51-
config.vm.provision :shell, :inline => "systemctl stop update-engine-reboot-manager && systemctl disable update-engine-reboot-manager && systemctl mask update-engine-reboot-manager", :privileged => true
52-
config.vm.provision :shell, :inline => "systemctl stop update-engine && systemctl disable update-engine && systemctl mask update-engine", :privileged => true
53-
5450
# user-data bootstrapping
5551
config.vm.provision :file, :source => "contrib/coreos/user-data", :destination => "/tmp/vagrantfile-user-data"
5652
config.vm.provision :shell, :inline => "mv /tmp/vagrantfile-user-data /var/lib/coreos-vagrant/", :privileged => true

contrib/coreos/user-data

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,23 @@ coreos:
4646
[Service]
4747
Environment=FLEET_PUBLIC_IP=$public_ipv4
4848
ExecStart=/usr/bin/fleet
49+
- name: stop-reboot-manager.service
50+
command: start
51+
content: |
52+
[Unit]
53+
Description=stop update-engine-reboot-manager
54+
55+
[Service]
56+
Type=oneshot
57+
ExecStart=/usr/bin/systemctl stop update-engine-reboot-manager.service
58+
ExecStartPost=/usr/bin/systemctl mask update-engine-reboot-manager.service
59+
- name: stop-reboot-manager.service
60+
command: start
61+
content: |
62+
[Unit]
63+
Description=stop update-engine
64+
65+
[Service]
66+
Type=oneshot
67+
ExecStart=/usr/bin/systemctl stop update-engine.service
68+
ExecStartPost=/usr/bin/systemctl mask update-engine.service

0 commit comments

Comments
 (0)