From 3ab19e85db2d39f1061ee2b9ab0e7de5b76d8863 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Sun, 4 Feb 2024 21:01:14 +0100 Subject: [PATCH] Have symlinks be created in /usr/sbin again The new Makefile does not create those symlinks anymore --- Makefile | 3 +++ lsbtools/lsbtools.py | 2 +- man/install_initd.8 | 4 ++-- man/lsb_release.1 | 4 ++-- man/remove_initd.8 | 4 ++-- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 8ca54e9..c9237df 100644 --- a/Makefile +++ b/Makefile @@ -34,8 +34,11 @@ install: all cp -av --no-preserve=ownership lsbtools \ -T $(DESTDIR)/$(PYLIB_DIR)/lsbtools install -D -vm755 lsb_release.ent $(DESTDIR)/usr/bin/lsb_release + install -vdm 755 $(DESTDIR)/usr/sbin for i in install_initd lsbinstall remove_initd; do \ install -D -vm755 $$i.ent $(DESTDIR)/usr/lib/lsb/$$i;\ + rm -fv $(DESTDIR)/usr/sbin/$$i; \ + ln -sv ../lib/lsb/$$i $(DESTDIR)/usr/sbin; \ done mkdir -pv $(DESTDIR)/usr/share/man/man1 install -vm644 man/lsb_release.1 $(DESTDIR)/usr/share/man/man1 diff --git a/lsbtools/lsbtools.py b/lsbtools/lsbtools.py index b4be3fd..b93dd95 100644 --- a/lsbtools/lsbtools.py +++ b/lsbtools/lsbtools.py @@ -137,7 +137,7 @@ def get_matrix(initdDir, debug): return matrix def get_prog_ver(strprogram): - progver = strprogram + " " + " (LSB-Tools-0.11)" + progver = strprogram + " " + " (LSB-Tools-0.12)" return progver def install_font(argobject): diff --git a/man/install_initd.8 b/man/install_initd.8 index 528d64e..164ef68 100644 --- a/man/install_initd.8 +++ b/man/install_initd.8 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4. -.TH INSTALL_INITD "8" "February 2024" "install_initd (LSB-Tools-0.11)" "LSB-Tools" +.TH INSTALL_INITD "8" "February 2024" "install_initd (LSB-Tools-0.12)" "LSB-Tools" .SH NAME -install_initd \- manual page for install_initd (LSB-Tools-0.11) +install_initd \- manual page for install_initd (LSB-Tools-0.12) .SH DESCRIPTION \fBinstall_initd\fR enables SERVICEs to be run at system initialization and shutdown. Each SERVICE corresponds to a Linux Standard Base (LSB) diff --git a/man/lsb_release.1 b/man/lsb_release.1 index 51d5be9..74f3295 100644 --- a/man/lsb_release.1 +++ b/man/lsb_release.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4. -.TH LSB_RELEASE "1" "February 2024" "lsb_release (LSB-Tools-0.11)" "LSB-Tools" +.TH LSB_RELEASE "1" "February 2024" "lsb_release (LSB-Tools-0.12)" "LSB-Tools" .SH NAME -lsb_release \- manual page for lsb_release (LSB-Tools-0.11) +lsb_release \- manual page for lsb_release (LSB-Tools-0.12) .SH DESCRIPTION lsb_release prints certain LSB (Linux Standard Base) and Distribution diff --git a/man/remove_initd.8 b/man/remove_initd.8 index 7ad4b97..c952b36 100644 --- a/man/remove_initd.8 +++ b/man/remove_initd.8 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4. -.TH REMOVE_INITD "8" "February 2024" "remove_initd (LSB-Tools-0.11)" "LSB-Tools" +.TH REMOVE_INITD "8" "February 2024" "remove_initd (LSB-Tools-0.12)" "LSB-Tools" .SH NAME -remove_initd \- manual page for remove_initd (LSB-Tools-0.11) +remove_initd \- manual page for remove_initd (LSB-Tools-0.12) .SH DESCRIPTION \fBremove_initd\fR disables SERVICEs from running at system initialization and shutdown. Each SERVICE corresponds to a Linux