diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/check-qemu-install | 8 | ||||
| -rwxr-xr-x | scripts/make-version-file | 4 | 
2 files changed, 8 insertions, 4 deletions
diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index 246f90b8..7aedd1a1 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -1,6 +1,6 @@  #!/usr/bin/env python3  # -# Copyright (C) 2019-2022, VyOS maintainers and contributors +# Copyright (C) 2019-2023, VyOS maintainers and contributors  #  # This program is free software; you can redistribute it and/or modify  # it under the terms of the GNU General Public License version 2 or later as @@ -146,7 +146,7 @@ def get_qemu_cmd(name, enable_kvm, enable_uefi, disk_img, raid=None, iso_img=Non          -smp sockets=1,cpus={cpucount},cores=1 \          -cpu host \          {uefi} \ -        -m 2G \ +        -m 3G \          -vga none \          -nographic \          -machine accel=kvm \ @@ -185,6 +185,10 @@ def shutdownVM(c, log, message=''):      log.info('Shutting down virtual machine')      for i in range(30):          log.info('Waiting for shutdown...') +        # Shutdown in qemu doesnt work first time +        # Use this workaround +        # https://vyos.dev/T5024 +        c.sendline('poweroff now')          if not c.isalive():              log.info('VM is shut down!')              break diff --git a/scripts/make-version-file b/scripts/make-version-file index e6d327ab..a5d94a65 100755 --- a/scripts/make-version-file +++ b/scripts/make-version-file @@ -108,11 +108,11 @@ PRETTY_NAME="VyOS {version} ({build_config['release_train']})"  NAME="VyOS"  VERSION_ID="{version}"  VERSION="{version} ({build_config['release_train']})" -VERSION_CODENAME=bullseye +VERSION_CODENAME=bookworm  ID=vyos  HOME_URL="https://vyos.io"  SUPPORT_URL="https://support.vyos.io" -BUG_REPORT_URL="https://phabricator.vyos.net" +BUG_REPORT_URL="https://vyos.dev"  """  os.makedirs(os.path.join(defaults.CHROOT_INCLUDES_DIR, 'usr/share/vyos'), exist_ok=True)  | 
