Bug#1060139: sysvinit: move aliased files to /usr for DEP17 /usr-move

Helmut Grohne helmut at subdivi.de
Sat Jan 6 10:02:34 GMT 2024 

Source: sysvinit
Version: 3.08-5
Tags: patch
User: helmutg at debian.org
Usertags: dep17m2

We want to finalize the /usr-merge via DEP17 by moving all aliased files
to /usr. sysvinit is involved early, because sysvinit-utils is
essential. I'm attaching a patch that performs the full move. This patch
should not be backported to bookworm-backports. If you plan to support
further backports, please use dh_movetousr instead. Regardless, which of
them you use, diversions require that the version that moves declares a
versioned conflict for molly-guard. The unstable molly-guard supports
working with both aliased and moved sysvinit-core, but unpacking a moved
sysvini-core on a bookworm molly-guard causes file loss. There is no
interaction with bfh-container/progress-linux-container as both depend
on systemd. Please upload this patch to experimental first to improve
the chances of QA (such as dumat) catching issues.

Helmut
-------------- next part --------------
diff --minimal -Nru sysvinit-3.08/debian/bootlogd.install sysvinit-3.08/debian/bootlogd.install
--- sysvinit-3.08/debian/bootlogd.install	2023-12-06 16:02:37.000000000 +0100
+++ sysvinit-3.08/debian/bootlogd.install	2024-01-05 16:03:52.000000000 +0100
@@ -1,3 +1,3 @@
-sbin/bootlogd
+sbin/bootlogd usr/sbin
 usr/bin/readbootlog
 debian/src/bootlogd/etc/init.d/* /etc/init.d/
diff --minimal -Nru sysvinit-3.08/debian/changelog sysvinit-3.08/debian/changelog
--- sysvinit-3.08/debian/changelog	2023-12-06 16:02:37.000000000 +0100
+++ sysvinit-3.08/debian/changelog	2024-01-05 16:11:40.000000000 +0100
@@ -1,3 +1,10 @@
+sysvinit (3.08-5.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * DEP17: Move files to /usr. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Fri, 05 Jan 2024 16:11:40 +0100
+
 sysvinit (3.08-5) unstable; urgency=medium
 
   * Add Greek debconf translation with thanks to Dimitris
diff --minimal -Nru sysvinit-3.08/debian/control sysvinit-3.08/debian/control
--- sysvinit-3.08/debian/control	2023-12-06 16:02:37.000000000 +0100
+++ sysvinit-3.08/debian/control	2024-01-05 16:11:40.000000000 +0100
@@ -32,6 +32,7 @@
 Conflicts:
  systemd-sysv,
  runit-init,
+ molly-guard (<< 0.8.3~),
 Breaks:
  manpages-es (<< 4.15.0-9~),
  manpages-fr (<< 4.15.0-9~),
diff --minimal -Nru sysvinit-3.08/debian/rules sysvinit-3.08/debian/rules
--- sysvinit-3.08/debian/rules	2023-12-06 16:02:37.000000000 +0100
+++ sysvinit-3.08/debian/rules	2024-01-05 16:03:47.000000000 +0100
@@ -90,11 +90,11 @@
 	ln -s halt-sysv.8.gz $(sysvtmp)/usr/share/man/man8/reboot-sysv.8.gz
 	rm $(sysvtmp)/usr/share/man/man8/poweroff.8.gz
 	ln -s halt-sysv.8.gz $(sysvtmp)/usr/share/man/man8/poweroff-sysv.8.gz
-	mv $(sysvtmp)/sbin/halt $(sysvtmp)/sbin/halt-sysv
-	rm $(sysvtmp)/sbin/reboot
-	ln -s halt-sysv $(sysvtmp)/sbin/reboot-sysv
-	rm $(sysvtmp)/sbin/poweroff
-	ln -s halt-sysv $(sysvtmp)/sbin/poweroff-sysv
+	mv $(sysvtmp)/usr/sbin/halt $(sysvtmp)/usr/sbin/halt-sysv
+	rm $(sysvtmp)/usr/sbin/reboot
+	ln -s halt-sysv $(sysvtmp)/usr/sbin/reboot-sysv
+	rm $(sysvtmp)/usr/sbin/poweroff
+	ln -s halt-sysv $(sysvtmp)/usr/sbin/poweroff-sysv
 endif
 
 override_dh_clean:
diff --minimal -Nru sysvinit-3.08/debian/src/initscripts/Makefile sysvinit-3.08/debian/src/initscripts/Makefile
--- sysvinit-3.08/debian/src/initscripts/Makefile	2023-12-06 16:02:37.000000000 +0100
+++ sysvinit-3.08/debian/src/initscripts/Makefile	2024-01-05 16:11:40.000000000 +0100
@@ -2,7 +2,8 @@
 sysconfdir = /etc
 prefix     = /usr
 docdir     = $(prefix)/share/doc/initscripts
-sbindir    = /sbin
+libdir     = $(prefix)/lib
+sbindir    = $(prefix)/sbin
 
 INSTALL      = install -m755
 INSTALL_DATA = install -m644
@@ -10,7 +11,7 @@
 all:
 
 install:
-	$(INSTALL) -d $(DESTDIR)/lib/init/.
+	$(INSTALL) -d $(DESTDIR)$(libdir)/init/.
 	$(INSTALL) -d $(DESTDIR)/var/lib/initscripts/.
 	$(INSTALL) -d $(DESTDIR)/var/lib/urandom/.
 	$(INSTALL) -d $(DESTDIR)/var/log/fsck/.
@@ -22,13 +23,13 @@
 	cp -afv etc/* $(DESTDIR)$(sysconfdir)
 	find $(DESTDIR)$(sysconfdir) -type d -name .svn -print0 |xargs -r0 rm -r
 
-	cp -afv lib/init/* $(DESTDIR)/lib/init
-	find $(DESTDIR)/lib -type d -name .svn  -print0 |xargs -r0 rm -r
+	cp -afv lib/init/* $(DESTDIR)$(libdir)/init
+	find $(DESTDIR)$(libdir) -type d -name .svn  -print0 |xargs -r0 rm -r
 	chmod 755 $(DESTDIR)$(sysconfdir)/init.d/[a-z]*
 	chmod 755 $(DESTDIR)$(sysconfdir)/network/if-up.d/[a-z]*
 	chmod 755 $(DESTDIR)$(sysconfdir)/rc.local
 	chmod 755 $(DESTDIR)$(sysconfdir)/rc.shutdown
-	chmod 644 $(DESTDIR)/lib/init/*.sh
+	chmod 644 $(DESTDIR)$(libdir)/init/*.sh
 	chmod -R g-w $(DESTDIR)
 
 	$(INSTALL) -d $(DESTDIR)$(sbindir)/.
diff --minimal -Nru sysvinit-3.08/debian/sysv-rc.install sysvinit-3.08/debian/sysv-rc.install
--- sysvinit-3.08/debian/sysv-rc.install	2023-12-06 16:02:37.000000000 +0100
+++ sysvinit-3.08/debian/sysv-rc.install	2024-01-05 16:04:02.000000000 +0100
@@ -1,2 +1,2 @@
-debian/src/sysv-rc/rc  /lib/init
-debian/src/sysv-rc/rcS /lib/init
+debian/src/sysv-rc/rc  /usr/lib/init
+debian/src/sysv-rc/rcS /usr/lib/init
diff --minimal -Nru sysvinit-3.08/debian/sysvinit-core.install sysvinit-3.08/debian/sysvinit-core.install
--- sysvinit-3.08/debian/sysvinit-core.install	2023-12-06 16:02:37.000000000 +0100
+++ sysvinit-3.08/debian/sysvinit-core.install	2024-01-05 16:04:14.000000000 +0100
@@ -1,5 +1,5 @@
-sbin/halt
-sbin/init
-sbin/runlevel
-sbin/shutdown
+sbin/halt usr/sbin
+sbin/init usr/sbin
+sbin/runlevel usr/sbin
+sbin/shutdown usr/sbin
 usr/include/initreq.h
diff --minimal -Nru sysvinit-3.08/debian/sysvinit-core.links sysvinit-3.08/debian/sysvinit-core.links
--- sysvinit-3.08/debian/sysvinit-core.links	2023-12-06 16:02:37.000000000 +0100
+++ sysvinit-3.08/debian/sysvinit-core.links	2024-01-05 16:11:40.000000000 +0100
@@ -1,3 +1,3 @@
-sbin/halt sbin/poweroff
-sbin/halt sbin/reboot
-sbin/init sbin/telinit
+usr/sbin/halt usr/sbin/poweroff
+usr/sbin/halt usr/sbin/reboot
+usr/sbin/init usr/sbin/telinit
diff --minimal -Nru sysvinit-3.08/debian/sysvinit-utils.install sysvinit-3.08/debian/sysvinit-utils.install
--- sysvinit-3.08/debian/sysvinit-utils.install	2023-12-06 16:02:37.000000000 +0100
+++ sysvinit-3.08/debian/sysvinit-utils.install	2024-01-05 16:04:34.000000000 +0100
@@ -1,9 +1,9 @@
-debian/init-d-script lib/init
-debian/vars.sh lib/init
-sbin/fstab-decode
-sbin/killall5
+debian/init-d-script usr/lib/init
+debian/vars.sh usr/lib/init
+sbin/fstab-decode usr/sbin
+sbin/killall5 usr/sbin
 usr/share/man/man8/fstab-decode.8
 usr/share/man/man8/killall5.8
 usr/share/man/man8/pidof.8
-debian/src/lsb-base/init-functions lib/lsb
-debian/src/lsb-base/init-functions.d/00-verbose lib/lsb/init-functions.d
+debian/src/lsb-base/init-functions usr/lib/lsb
+debian/src/lsb-base/init-functions.d/00-verbose usr/lib/lsb/init-functions.d
diff --minimal -Nru sysvinit-3.08/debian/sysvinit-utils.links sysvinit-3.08/debian/sysvinit-utils.links
--- sysvinit-3.08/debian/sysvinit-utils.links	2023-12-06 16:02:37.000000000 +0100
+++ sysvinit-3.08/debian/sysvinit-utils.links	2024-01-05 16:11:29.000000000 +0100
@@ -1 +1 @@
-sbin/killall5 bin/pidof
+usr/sbin/killall5 usr/bin/pidof

More information about the Debian-init-diversity mailing list