diff options
| author | dd <dd@wx.tnyzeq.icu> | 2024-10-07 20:00:11 +0200 |
|---|---|---|
| committer | dd <dd@wx.tnyzeq.icu> | 2024-10-07 20:00:11 +0200 |
| commit | 1e5f877153c493ad0f245b9c0c9f4a68f9124717 (patch) | |
| tree | a93069738d8090fe2d6d7f083b6ead51e0d149c0 | |
| parent | 7172f4ebe01f85996fef6808d4742abb51231b9e (diff) | |
| parent | c1fc21a0adb6052e45c8a72f34f017ddc65c7e32 (diff) | |
| download | vyos-build-1e5f877153c493ad0f245b9c0c9f4a68f9124717.tar.gz vyos-build-1e5f877153c493ad0f245b9c0c9f4a68f9124717.zip | |
Merge branch 'vyos:current' into current
| -rwxr-xr-x | scripts/image-build/build-vyos-image | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image index b1e6b6f3..a9294f38 100755 --- a/scripts/image-build/build-vyos-image +++ b/scripts/image-build/build-vyos-image @@ -452,19 +452,18 @@ if __name__ == "__main__": # Multi line strings needs to be un-indented to not have leading # whitespaces in the resulting file - os_release = f""" - PRETTY_NAME="VyOS {version} ({build_config['release_train']})" - NAME="VyOS" - VERSION_ID="{version}" - VERSION="{version} ({build_config['release_train']})" - VERSION_CODENAME={build_defaults['debian_distribution']} - ID=vyos - BUILD_ID="{build_git}" - HOME_URL="{build_defaults['website_url']}" - SUPPORT_URL="{build_defaults['support_url']}" - BUG_REPORT_URL="{build_defaults['bugtracker_url']}" - DOCUMENTATION_URL="{build_config['documentation_url']}" - """ + os_release = f"""PRETTY_NAME="VyOS {version} ({build_config['release_train']})" +NAME="VyOS" +VERSION_ID="{version}" +VERSION="{version} ({build_config['release_train']})" +VERSION_CODENAME={build_defaults['debian_distribution']} +ID=vyos +BUILD_ID="{build_git}" +HOME_URL="{build_defaults['website_url']}" +SUPPORT_URL="{build_defaults['support_url']}" +BUG_REPORT_URL="{build_defaults['bugtracker_url']}" +DOCUMENTATION_URL="{build_config['documentation_url']}" +""" # Reminder: all paths relative to the build dir, not to the repository root chroot_includes_dir = defaults.CHROOT_INCLUDES_DIR @@ -484,8 +483,8 @@ if __name__ == "__main__": print("Version: {0}".format(version), file=f) # Define variables that influence to welcome message on boot - os.makedirs(os.path.join(chroot_includes_dir, 'usr/lib/'), exist_ok=True) - with open(os.path.join(chroot_includes_dir, 'usr/lib/os-release'), 'w') as f: + os.makedirs(os.path.join(chroot_includes_dir, 'etc/'), exist_ok=True) + with open(os.path.join(chroot_includes_dir, 'etc/os-release'), 'w') as f: print(os_release, file=f) ## Clean up earlier build state and artifacts |