diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2020-07-14 09:42:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-14 09:42:23 +0200 |
| commit | 4af1ea60f37d8a63a3a9633be14591f1b2066cd1 (patch) | |
| tree | a8bfc25e3f3d4e21ddaf548dd1679a2e414a1ec8 /conf | |
| parent | 983123656f93a28c4c1ad07e4b1855833511d922 (diff) | |
| parent | 4cb3ea0eca94ba8b20d2c8035e6c12f863e4fd3d (diff) | |
| download | meta-updater-4af1ea60f37d8a63a3a9633be14591f1b2066cd1.tar.gz | |
Merge pull request #749 from advancedtelematic/feat/dunfell/2020.8
Feat/dunfell/2020.8
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/poky-sota-systemd.conf | 2 | ||||
| -rw-r--r-- | conf/local.conf.nonostree.append | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/distro/poky-sota-systemd.conf b/conf/distro/poky-sota-systemd.conf index 0dc50b0..4b7990f 100644 --- a/conf/distro/poky-sota-systemd.conf +++ b/conf/distro/poky-sota-systemd.conf | |||
| @@ -9,4 +9,4 @@ DISTRO_CODENAME = "sota" | |||
| 9 | 9 | ||
| 10 | DISTRO_FEATURES_append = " systemd" | 10 | DISTRO_FEATURES_append = " systemd" |
| 11 | VIRTUAL-RUNTIME_init_manager = "systemd" | 11 | VIRTUAL-RUNTIME_init_manager = "systemd" |
| 12 | PREFERRED_RPROVIDER_virtual/network-configuration ??= "networkd-dhcp-conf" | 12 | PREFERRED_RPROVIDER_network-configuration ??= "networkd-dhcp-conf" |
diff --git a/conf/local.conf.nonostree.append b/conf/local.conf.nonostree.append index 0e63e98..ee56b69 100644 --- a/conf/local.conf.nonostree.append +++ b/conf/local.conf.nonostree.append | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | DISTRO_FEATURES_append = " systemd" | 2 | DISTRO_FEATURES_append = " systemd" |
| 3 | VIRTUAL-RUNTIME_init_manager = "systemd" | 3 | VIRTUAL-RUNTIME_init_manager = "systemd" |
| 4 | 4 | ||
| 5 | PREFERRED_RPROVIDER_virtual/network-configuration ??= "networkd-dhcp-conf" | 5 | PREFERRED_RPROVIDER_network-configuration ??= "networkd-dhcp-conf" |
| 6 | 6 | ||
| 7 | SOTA_DEPLOY_CREDENTIALS ?= "1" | 7 | SOTA_DEPLOY_CREDENTIALS ?= "1" |
| 8 | PACKAGECONFIG_pn-aktualizr = "" | 8 | PACKAGECONFIG_pn-aktualizr = "" |