[pve-devel] [PATCH installer] gui: remove G_SLICE=always-malloc usage

[Maximiliano Sandoval <m.sandoval@proxmox.com>]

Since Glib 2.76 there is no need to set this environment variable as
this is the default now. For more details see the release notes of
2.75.3 (pre-release for 2.76). Additionally, when run under Valgrind it
would use malloc even from before 2.75.3.

Proxmox VE 9 ships with libglib2.0 2.84.

[1] https://gitlab.gnome.org/GNOME/glib/-/releases/2.75.3

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 Makefile    | 10 +++++-----
 proxinstall |  4 ----
 xinitrc     |  2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 878c4bd..ad79925 100644
--- a/Makefile
+++ b/Makefile
@@ -182,12 +182,12 @@ cd-info.test:
 check-pve: prepare-check-env test.img
 	rm -f cd-info.test; $(MAKE) cd-info.test
 	./proxmox-low-level-installer dump-env -t test.img
-	G_SLICE=always-malloc perl -I testdir/usr/share/perl5 testdir/usr/bin/proxinstall -t test.img
+	perl -I testdir/usr/share/perl5 testdir/usr/bin/proxinstall -t test.img
 
 check-pve-multidisks: prepare-check-env test.img test2.img test3.img test4.img test5.big.img
 	rm -f cd-info.test; $(MAKE) cd-info.test
 	./proxmox-low-level-installer dump-env -t test.img,test2.img,test3.img,test4.img,test5.big.img
-	G_SLICE=always-malloc perl -I testdir/usr/share/perl5 testdir/usr/bin/proxinstall -t test.img,test2.img,test3.img,test4.img,test5.big.img
+	perl -I testdir/usr/share/perl5 testdir/usr/bin/proxinstall -t test.img,test2.img,test3.img,test4.img,test5.big.img
 
 check-pve-tui: prepare-check-env test.img
 	rm -f cd-info.test; $(MAKE) cd-info.test
@@ -208,7 +208,7 @@ prepare-check-pmg: prepare-check-env test.img
 	./proxmox-low-level-installer dump-env -t test.img
 
 check-pmg: prepare-check-pmg
-	G_SLICE=always-malloc perl -I testdir/usr/share/perl5 testdir/usr/bin/proxinstall -t test.img
+	perl -I testdir/usr/share/perl5 testdir/usr/bin/proxinstall -t test.img
 
 check-pmg-tui: prepare-check-pmg
 	testdir/usr/bin/proxmox-tui-installer -t test.img 2>testdir/run/stderr
@@ -222,7 +222,7 @@ prepare-check-pbs: prepare-check-env test.img
 	./proxmox-low-level-installer dump-env -t test.img
 
 check-pbs: prepare-check-pbs
-	G_SLICE=always-malloc perl -I testdir/usr/share/perl5 testdir/usr/bin/proxinstall -t test.img
+	perl -I testdir/usr/share/perl5 testdir/usr/bin/proxinstall -t test.img
 
 check-pbs-tui: prepare-check-pbs
 	testdir/usr/bin/proxmox-tui-installer -t test.img 2>testdir/run/stderr
@@ -236,7 +236,7 @@ prepare-check-pdm: prepare-check-env test.img
 	./proxmox-low-level-installer dump-env -t test.img
 
 check-pdm: prepare-check-pdm
-	G_SLICE=always-malloc perl -I testdir/usr/share/perl5 testdir/usr/bin/proxinstall -t test.img
+	perl -I testdir/usr/share/perl5 testdir/usr/bin/proxinstall -t test.img
 
 check-pdm-tui: prepare-check-pdm
 	testdir/usr/bin/proxmox-tui-installer -t test.img 2>testdir/run/stderr
diff --git a/proxinstall b/proxinstall
index bf93b48..5ba65fa 100755
--- a/proxinstall
+++ b/proxinstall
@@ -40,10 +40,6 @@ use Proxmox::Sys::File qw(file_read_all file_write_all);
 use Proxmox::Sys::Net qw(parse_ip_address parse_ip_mask);
 use Proxmox::UI;
 
-if (!$ENV{G_SLICE} || $ENV{G_SLICE} ne "always-malloc") {
-    die "do not use slice allocator (run with 'G_SLICE=always-malloc ./proxinstall ...')\n";
-}
-
 my $step_number = 0; # Init number for global function list
 
 my @steps = (
diff --git a/xinitrc b/xinitrc
index 5125406..02e67d9 100644
--- a/xinitrc
+++ b/xinitrc
@@ -4,4 +4,4 @@
 /usr/bin/X11/xsetroot -solid grey
 openbox &
 /.spice-vdagent.sh &
-G_SLICE=always-malloc /usr/bin/proxinstall
+/usr/bin/proxinstall
-- 
2.47.2



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel