From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id C1A6963D55 for ; Wed, 28 Oct 2020 19:55:19 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8CBC422A03 for ; Wed, 28 Oct 2020 19:54:49 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 7CBAF229C0 for ; Wed, 28 Oct 2020 19:54:47 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3899D45F87 for ; Wed, 28 Oct 2020 19:54:47 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@pve.proxmox.com Date: Wed, 28 Oct 2020 19:54:17 +0100 Message-Id: <20201028185432.23067-2-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028185432.23067-1-s.ivanov@proxmox.com> References: <20201028185432.23067-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.084 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [directory.pm, systemd.pm] Subject: [pmg-devel] [PATCH pve-common 1/2] Systemd: add helpers for parsing unit files X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Oct 2020 18:55:19 -0000 taken from pve-storage/PVE/API2/Disks/Directory.pm (and made available as public sub) Signed-off-by: Stoiko Ivanov --- refactoring pve-storage to use this (and drop the now duplicated code) will be done separately src/PVE/Systemd.pm | 72 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/src/PVE/Systemd.pm b/src/PVE/Systemd.pm index 85b35a3..bcba5eb 100644 --- a/src/PVE/Systemd.pm +++ b/src/PVE/Systemd.pm @@ -7,6 +7,8 @@ use Net::DBus qw(dbus_uint32 dbus_uint64); use Net::DBus::Callback; use Net::DBus::Reactor; +use PVE::Tools qw(file_set_contents file_get_contents trim); + sub escape_unit { my ($val, $is_path) = @_; @@ -163,4 +165,74 @@ sub wait_for_unit_removed($;$) { }, $timeout); } +sub read_ini { + my ($filename) = @_; + + my $content = file_get_contents($filename); + my @lines = split /\n/, $content; + + my $result = {}; + my $section; + + foreach my $line (@lines) { + $line = trim($line); + if ($line =~ m/^\[([^\]]+)\]/) { + $section = $1; + if (!defined($result->{$section})) { + $result->{$section} = {}; + } + } elsif ($line =~ m/^(.*?)=(.*)$/) { + my ($key, $val) = ($1, $2); + if (!$section) { + warn "key value pair found without section, skipping\n"; + next; + } + + if ($result->{$section}->{$key}) { + # make duplicate properties to arrays to keep the order + my $prop = $result->{$section}->{$key}; + if (ref($prop) eq 'ARRAY') { + push @$prop, $val; + } else { + $result->{$section}->{$key} = [$prop, $val]; + } + } else { + $result->{$section}->{$key} = $val; + } + } + # ignore everything else + } + + return $result; +}; + +sub write_ini { + my ($ini, $filename) = @_; + + my $content = ""; + + foreach my $sname (sort keys %$ini) { + my $section = $ini->{$sname}; + + $content .= "[$sname]\n"; + + foreach my $pname (sort keys %$section) { + my $prop = $section->{$pname}; + + if (!ref($prop)) { + $content .= "$pname=$prop\n"; + } elsif (ref($prop) eq 'ARRAY') { + foreach my $val (@$prop) { + $content .= "$pname=$val\n"; + } + } else { + die "invalid property '$pname'\n"; + } + } + $content .= "\n"; + } + + file_set_contents($filename, $content); +}; + 1; -- 2.20.1