diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2019-06-13 16:59:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-13 16:59:21 +0200 |
| commit | 1c049cbaec927971b0425e608b68551a4d2b898b (patch) | |
| tree | 1b549011977622f2883bd13ac2c299f29609838c /scripts | |
| parent | 9725c55078e6216437904aa63d5bb5c632f92302 (diff) | |
| parent | 249254d0100eb19a2be5929cc14ee9f64bf0dd7c (diff) | |
| download | meta-updater-1c049cbaec927971b0425e608b68551a4d2b898b.tar.gz | |
Merge pull request #526 from advancedtelematic/refactor/thud/renaming-secondaries-etc
Refactor/thud/renaming secondaries etc
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/find_aktualizr_dependencies.sh | 13 | ||||
| -rw-r--r-- | scripts/qemucommand.py | 4 |
2 files changed, 9 insertions, 8 deletions
diff --git a/scripts/find_aktualizr_dependencies.sh b/scripts/find_aktualizr_dependencies.sh index 986b541..493df80 100755 --- a/scripts/find_aktualizr_dependencies.sh +++ b/scripts/find_aktualizr_dependencies.sh | |||
| @@ -10,14 +10,15 @@ parentdir="$(dirname "$0")" | |||
| 10 | # (jsoncpp, open62541, picojson). Also check libp11, dpkg, and systemd since | 10 | # (jsoncpp, open62541, picojson). Also check libp11, dpkg, and systemd since |
| 11 | # those are common dependencies not enabled by default. | 11 | # those are common dependencies not enabled by default. |
| 12 | ${parentdir}/find_dependencies.py aktualizr | 12 | ${parentdir}/find_dependencies.py aktualizr |
| 13 | ${parentdir}/find_dependencies.py aktualizr-auto-prov | 13 | ${parentdir}/find_dependencies.py aktualizr-shared-prov |
| 14 | ${parentdir}/find_dependencies.py aktualizr-auto-prov-creds | 14 | ${parentdir}/find_dependencies.py aktualizr-shared-prov-creds |
| 15 | ${parentdir}/find_dependencies.py aktualizr-ca-implicit-prov | 15 | ${parentdir}/find_dependencies.py aktualizr-device-prov |
| 16 | ${parentdir}/find_dependencies.py aktualizr-ca-implicit-prov-creds | 16 | ${parentdir}/find_dependencies.py aktualizr-device-prov-creds |
| 17 | ${parentdir}/find_dependencies.py aktualizr-hsm-prov | 17 | ${parentdir}/find_dependencies.py aktualizr-device-prov-hsm |
| 18 | ${parentdir}/find_dependencies.py aktualizr-hsm-prov-creds | 18 | ${parentdir}/find_dependencies.py aktualizr-auto-reboot |
| 19 | ${parentdir}/find_dependencies.py aktualizr-disable-send-ip | 19 | ${parentdir}/find_dependencies.py aktualizr-disable-send-ip |
| 20 | ${parentdir}/find_dependencies.py aktualizr-log-debug | 20 | ${parentdir}/find_dependencies.py aktualizr-log-debug |
| 21 | ${parentdir}/find_dependencies.py aktualizr-polling-interval | ||
| 21 | ${parentdir}/find_dependencies.py libp11 | 22 | ${parentdir}/find_dependencies.py libp11 |
| 22 | ${parentdir}/find_dependencies.py dpkg | 23 | ${parentdir}/find_dependencies.py dpkg |
| 23 | ${parentdir}/find_dependencies.py systemd | 24 | ${parentdir}/find_dependencies.py systemd |
diff --git a/scripts/qemucommand.py b/scripts/qemucommand.py index cafab6d..1049d7c 100644 --- a/scripts/qemucommand.py +++ b/scripts/qemucommand.py | |||
| @@ -109,8 +109,8 @@ class QemuCommand(object): | |||
| 109 | cmdline += ['-net', 'dump,file=' + self.pcap] | 109 | cmdline += ['-net', 'dump,file=' + self.pcap] |
| 110 | if self.secondary_network: | 110 | if self.secondary_network: |
| 111 | cmdline += [ | 111 | cmdline += [ |
| 112 | '-net', 'nic,vlan=1,macaddr='+random_mac(), | 112 | '-netdev', 'socket,id=vlan1,mcast=230.0.0.1:1234,localaddr=127.0.0.1', |
| 113 | '-net', 'socket,vlan=1,mcast=230.0.0.1:1234,localaddr=127.0.0.1', | 113 | '-device', 'e1000,netdev=vlan1,mac='+random_mac(), |
| 114 | ] | 114 | ] |
| 115 | if self.gui: | 115 | if self.gui: |
| 116 | cmdline += ["-serial", "stdio"] | 116 | cmdline += ["-serial", "stdio"] |