diff options
author | Runar Borge <runar@borge.nu> | 2019-07-22 21:54:20 +0200 |
---|---|---|
committer | Runar Borge <runar@borge.nu> | 2019-07-22 21:54:20 +0200 |
commit | 6056acfa06c2b79ee8981b9f36a1ced2dac29111 (patch) | |
tree | 613944f1de089105950a86501507b6aa2151380d /data/live-build-config/hooks/live/18-enable-disable_services.chroot | |
parent | b229f0bd958a42c6faa345c91500c2ed8ccdc919 (diff) | |
parent | 8c22ceead487b745d6b7c058c4d1c0a0eaa051c8 (diff) | |
download | vyos-build-6056acfa06c2b79ee8981b9f36a1ced2dac29111.tar.gz vyos-build-6056acfa06c2b79ee8981b9f36a1ced2dac29111.zip |
Merge remote-tracking branch 'origin/current' into equuleus
fixed merge errors in:
* scripts/live-build-config
- kernel parameters
* scripts/build-packages
- fixed list of packages to compile
Diffstat (limited to 'data/live-build-config/hooks/live/18-enable-disable_services.chroot')
-rwxr-xr-x | data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot index d4d89ba8..787510e0 100755 --- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot +++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot @@ -38,3 +38,4 @@ systemctl disable tftpd-hpa.service systemctl disable strongswan.service systemctl disable frr.service systemctl disable salt-minion.service +systemctl disable nginx.service |