diff options
Diffstat (limited to 'scripts/runqemu')
-rwxr-xr-x | scripts/runqemu | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/scripts/runqemu b/scripts/runqemu index 2817acb19f..cdbb625505 100755 --- a/scripts/runqemu +++ b/scripts/runqemu | |||
@@ -1195,16 +1195,20 @@ to your build configuration. | |||
1195 | uid = os.getuid() | 1195 | uid = os.getuid() |
1196 | logger.info("Setting up tap interface under sudo") | 1196 | logger.info("Setting up tap interface under sudo") |
1197 | cmd = ('sudo', self.qemuifup, str(gid)) | 1197 | cmd = ('sudo', self.qemuifup, str(gid)) |
1198 | try: | 1198 | for _ in range(5): |
1199 | tap = subprocess.check_output(cmd).decode('utf-8').strip() | 1199 | try: |
1200 | except subprocess.CalledProcessError as e: | 1200 | tap = subprocess.check_output(cmd).decode('utf-8').strip() |
1201 | logger.error('Setting up tap device failed:\n%s\nRun runqemu-gen-tapdevs to manually create one.' % str(e)) | 1201 | except subprocess.CalledProcessError as e: |
1202 | sys.exit(1) | 1202 | logger.error('Setting up tap device failed:\n%s\nRun runqemu-gen-tapdevs to manually create one.' % str(e)) |
1203 | lockfile = os.path.join(lockdir, tap) | 1203 | sys.exit(1) |
1204 | self.taplock = lockfile + '.lock' | 1204 | lockfile = os.path.join(lockdir, tap) |
1205 | self.acquire_taplock() | 1205 | self.taplock = lockfile + '.lock' |
1206 | self.cleantap = True | 1206 | if self.acquire_taplock(): |
1207 | logger.debug('Created tap: %s' % tap) | 1207 | self.cleantap = True |
1208 | logger.debug('Created tap: %s' % tap) | ||
1209 | break | ||
1210 | else: | ||
1211 | tap = None | ||
1208 | 1212 | ||
1209 | if not tap: | 1213 | if not tap: |
1210 | logger.error("Failed to setup tap device. Run runqemu-gen-tapdevs to manually create.") | 1214 | logger.error("Failed to setup tap device. Run runqemu-gen-tapdevs to manually create.") |