[PATCH installer 0/3] clean up old, unused files

[PATCH installer 0/3] clean up old, unused files

[Christoph Heiss]

These files and settings are unused for long times now and can be safely
deleted.

To be sure; did some test installs in all three variants (GUI, TUI and
auto) and did not notice anything off.

Christoph Heiss (3):
  checktime: drop unused script
  install: drop unused pve-manager/country debconf setting
  interfaces: drop unused file

 Makefile           |  4 ----
 Proxmox/Install.pm |  4 ----
 checktime          | 26 --------------------------
 debian/install     |  2 --
 interfaces         |  2 --
 5 files changed, 38 deletions(-)
 delete mode 100755 checktime
 delete mode 100644 interfaces

-- 
2.54.0

[PATCH installer 1/3] checktime: drop unused script

[Christoph Heiss]

This has been unused since

  5490bc6 ("remove call to /usr/bin/checktime")

which removed the last callsite of this script in 2012.

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
 Makefile       |  2 --
 checktime      | 26 --------------------------
 debian/install |  1 -
 3 files changed, 29 deletions(-)
 delete mode 100755 checktime

diff --git a/Makefile b/Makefile
index bb5dc86..acf99d5 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,6 @@ $(BUILDDIR):
 	  Proxmox/ \
 	  Xdefaults \
 	  banner/ \
-	  checktime \
 	  country.pl \
 	  html/ \
 	  interfaces \
@@ -134,7 +133,6 @@ install: $(INSTALLER_SOURCES) $(COMPILED_BINS)
 	install -D -m 755 proxinstall $(DESTDIR)/usr/bin/proxinstall
 	install -D -m 755 proxmox-low-level-installer $(DESTDIR)/$(BINDIR)/proxmox-low-level-installer
 	$(foreach i,$(USR_BIN), install -m755 $(CARGO_COMPILEDIR)/$(i) $(DESTDIR)$(BINDIR)/ ;)
-	install -D -m 755 checktime $(DESTDIR)/usr/bin/checktime
 	install -D -m 644 xinitrc $(DESTDIR)/.xinitrc
 	install -D -m 755 spice-vdagent.sh $(DESTDIR)/.spice-vdagent.sh
 	install -D -m 644 Xdefaults $(DESTDIR)/.Xdefaults
diff --git a/checktime b/checktime
deleted file mode 100755
index 723edd6..0000000
--- a/checktime
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use warnings;
-
-use File::stat;
-use POSIX qw(strftime);
-
-sub testtime {
-    my $st = stat("/usr/bin/checktime") || stat("./checktime");
-
-    my $ctime = time();
-
-    if ($ctime < $st->atime) {
-	my $system_time_str = strftime "%F %T", localtime $ctime;
-	my $pkg_time_str = strftime "%F %T", localtime $st->atime;
-	warn "detected wrong system time $system_time_str, older than installer ($pkg_time_str)\n";
-	my $tstr = localtime $st->atime;
-	# correct system time to avoid errors, i.e gpg fails
-	system ("date -s '$tstr'"); 
-    }
-}
-
-testtime();
-
-exit (0);
diff --git a/debian/install b/debian/install
index 132220a..291347f 100644
--- a/debian/install
+++ b/debian/install
@@ -8,7 +8,6 @@ banner/pve-banner.png /var/lib/proxmox-installer
 etc
 html /var/lib/proxmox-installer/
 usr/sbin
-usr/bin/checktime
 usr/bin/proxinstall
 usr/bin/proxmox-auto-installer
 usr/bin/proxmox-chroot
-- 
2.54.0

[PATCH installer 2/3] install: drop unused pve-manager/country debconf setting

[Christoph Heiss]

This is effectively dead code since pve-manager commit

  4bfc63047 ("buildsys: remove unused debconf template")

which removed the respective debconf template back in 2018.

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
 Proxmox/Install.pm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Proxmox/Install.pm b/Proxmox/Install.pm
index 788aca4..3f92bfd 100644
--- a/Proxmox/Install.pm
+++ b/Proxmox/Install.pm
@@ -1469,10 +1469,6 @@ _EOD
         }
 
         if ($iso_env->{product} eq 'pve') {
-            # save installer settings
-            my $ucc = uc($country);
-            debconfig_set($targetdir, "pve-manager pve-manager/country string $ucc\n");
-
             # do run a potentially unconfigured/unisolated network accessible routing daemon
             unlink "$targetdir/etc/systemd/system/multi-user.target.wants/frr.service"
                 or $!{ENOENT}
-- 
2.54.0

[PATCH installer 3/3] interfaces: drop unused file

[Christoph Heiss]

This file isn't used anywhere, drop it.

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
For this one, I couldn't find a reference when/why this was introduced
or left unused, as both seem to predate the git history.

 Makefile       | 2 --
 debian/install | 1 -
 interfaces     | 2 --
 3 files changed, 5 deletions(-)
 delete mode 100644 interfaces

diff --git a/Makefile b/Makefile
index acf99d5..fe8bba5 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,6 @@ $(BUILDDIR):
 	  banner/ \
 	  country.pl \
 	  html/ \
-	  interfaces \
 	  proxinstall \
 	  proxmox-low-level-installer \
 	  proxmox-auto-installer/ \
@@ -125,7 +124,6 @@ install: $(INSTALLER_SOURCES) $(COMPILED_BINS)
 	$(MAKE) -C banner install
 	$(MAKE) -C Proxmox install
 	$(MAKE) -C proxmox-first-boot install
-	install -D -m 644 interfaces $(DESTDIR)/etc/network/interfaces
 	install -D -m 755 fake-start-stop-daemon $(VARLIBDIR)/fake-start-stop-daemon
 	install -D -m 755 policy-disable-rc.d $(VARLIBDIR)/policy-disable-rc.d
 	install -D -m 644 locale-info.json $(VARLIBDIR)/locale-info.json
diff --git a/debian/install b/debian/install
index 291347f..445487a 100644
--- a/debian/install
+++ b/debian/install
@@ -5,7 +5,6 @@ banner/pbs-banner.png /var/lib/proxmox-installer
 banner/pdm-banner.png /var/lib/proxmox-installer
 banner/pmg-banner.png /var/lib/proxmox-installer
 banner/pve-banner.png /var/lib/proxmox-installer
-etc
 html /var/lib/proxmox-installer/
 usr/sbin
 usr/bin/proxinstall
diff --git a/interfaces b/interfaces
deleted file mode 100644
index f1bd92e..0000000
--- a/interfaces
+++ /dev/null
@@ -1,2 +0,0 @@
-auto lo
-iface lo inet loopback
-- 
2.54.0