public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Shannon Sterz <s.sterz@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH container 06/21] setup: use parse_os_release from PVE::Systemd
Date: Fri, 28 Aug 2026 15:30:15 +0200	[thread overview]
Message-ID: <20260828133030.351140-7-s.sterz@proxmox.com> (raw)
In-Reply-To: <20260828133030.351140-1-s.sterz@proxmox.com>

this was moved to PVE::Systemd to make the parse more re-usable and
avoid multiple implementations.

Signed-off-by: Shannon Sterz <s.sterz@proxmox.com>
---
 src/PVE/LXC/Setup.pm | 35 ++---------------------------------
 1 file changed, 2 insertions(+), 33 deletions(-)

diff --git a/src/PVE/LXC/Setup.pm b/src/PVE/LXC/Setup.pm
index d936af2..c8c036d 100644
--- a/src/PVE/LXC/Setup.pm
+++ b/src/PVE/LXC/Setup.pm
@@ -7,6 +7,7 @@ use POSIX;
 use Cwd 'abs_path';
 
 use PVE::RESTEnvironment;
+use PVE::Systemd;
 use PVE::Tools;
 
 use PVE::LXC::Setup::Alpine;
@@ -335,38 +336,6 @@ sub unified_cgroupv2_support {
     return $self->{plugin}->unified_cgroupv2_support($self->get_ct_init_path());
 }
 
-# os-release(5):
-#   (...) a newline-separated list of environment-like shell-compatible
-#   variable assignments. (...) beyond mere variable assignments, no shell
-#   features are supported (this means variable expansion is explicitly not
-#   supported) (...). Variable assignment values must be enclosed in double or
-#   single quotes *if* they include spaces, semicolons or other special
-#   characters outside of A-Z, a-z, 0-9. Shell special characters ("$", quotes,
-#   backslash, backtick) must be escaped with backslashes (...). All strings
-#   should be in UTF-8 format, and non-printable characters should not be used.
-#   It is not supported to concatenate multiple individually quoted strings.
-#   Lines beginning with "#" shall be ignored as comments.
-my $parse_os_release = sub {
-    my ($data) = @_;
-    my $variables = {};
-    while (defined($data) && $data =~ /^(.+)$/gm) {
-        next if $1 !~ /^\s*([a-zA-Z_][a-zA-Z0-9_]*)=(.*)$/;
-        my ($var, $content) = ($1, $2);
-        chomp $content;
-
-        if ($content =~ /^'([^']*)'/) {
-            $variables->{$var} = $1;
-        } elsif ($content =~ /^"((?:[^"\\]|\\.)*)"/) {
-            my $s = $1;
-            $s =~ s/(\\["'`nt\$\\])/"\"$1\""/eeg;
-            $variables->{$var} = $s;
-        } elsif ($content =~ /^([A-Za-z0-9]*)/) {
-            $variables->{$var} = $1;
-        }
-    }
-    return $variables;
-};
-
 sub get_ct_os_release {
     my ($self) = @_;
 
@@ -379,7 +348,7 @@ sub get_ct_os_release {
         return undef;
     });
 
-    return &$parse_os_release($data);
+    return PVE::Systemd::parse_os_release($data);
 }
 
 # Checks whether /sbin/init is a symlink, and if it is, resolves it to the actual binary
-- 
2.47.3





  parent reply	other threads:[~2026-08-28 13:30 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-08-28 13:30 [RFC cluster/common/container/docs/installer/manager 00/21] add rudimentary host backup mechanism Shannon Sterz
2026-08-28 13:30 ` [PATCH cluster 01/21] pmxcfs: status: fix formatting of parameters in checked_mkdir() Shannon Sterz
2026-08-28 13:30 ` [PATCH cluster 02/21] pmxcfs: correctly log message when directory can't be created Shannon Sterz
2026-08-28 13:30 ` [PATCH cluster 03/21] pmxcfs: add live backup capability Shannon Sterz
2026-08-28 13:30 ` [PATCH cluster 04/21] pmxcfs: add ability to query backup progress Shannon Sterz
2026-08-28 13:30 ` [PATCH common 05/21] systemd: move parse_os_release() helper to PVE::Systemd Shannon Sterz
2026-08-28 13:30 ` Shannon Sterz [this message]
2026-08-28 13:30 ` [PATCH manager 07/21] jobs/api: add basic host backup job logic Shannon Sterz
2026-08-28 13:30 ` [PATCH manager 08/21] api: cluster: add endpoints for manage host backup jobs Shannon Sterz
2026-08-28 13:30 ` [PATCH manager 09/21] api: node: add endpoints for listing backups for a node Shannon Sterz
2026-08-28 13:30 ` [PATCH manager 10/21] api: host backup: include global, disk and network options for restore Shannon Sterz
2026-08-28 13:30 ` [PATCH manager 11/21] api: host backup: add warnings in case zfs snapdir is disabled Shannon Sterz
2026-08-28 13:30 ` [PATCH manager 12/21] ui: node: add panel to manage backups of a host Shannon Sterz
2026-08-28 13:30 ` [PATCH manager 13/21] ui: dc: add panel for managing host backup jobs Shannon Sterz
2026-08-28 13:30 ` [PATCH installer 14/21] bump proxmox-installer-types to 0.2 Shannon Sterz
2026-08-28 13:30 ` [PATCH installer 15/21] make tidy and clean up whitespace in unconfigured.sh Shannon Sterz
2026-08-28 13:30 ` [PATCH installer 16/21] installer-common: add option to verify TLS connections via callback Shannon Sterz
2026-08-28 13:30 ` [PATCH installer 17/21] low-level-installer: add support for restoring backups Shannon Sterz
2026-08-28 13:30 ` [PATCH installer 18/21] installer-common/tui-installer: implement restore tui Shannon Sterz
2026-08-28 13:30 ` [PATCH installer 19/21] unconfigured: add restore mode to unconfigured.sh Shannon Sterz
2026-08-28 13:30 ` [PATCH installer 20/21] tui-installer: unmount a potentially mounted backup on abort Shannon Sterz
2026-08-28 13:30 ` [PATCH docs 21/21] examples: add example hook script for host backup jobs Shannon Sterz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260828133030.351140-7-s.sterz@proxmox.com \
    --to=s.sterz@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal