Hello again!
I've been asked to replace additional program shipped in
sysvinit-utils (src:sysvinit) with counterparts from src:util-linux.
Patch for sysvinit attached:
0001-Let-util-linux-provide-sulogin-last-lastb-mesg.patch
(This is on top of previously posted patch:
0001-Let-mount-src-util-linux-provide-mountpoint.patch)
I'm also including the counterpart for util-linux as a reference:
0001-util-linux-ship-sulogin-last-lastb-mesg-utilities.patch
(This is also on top of previously posted patch, on top of pkg-util-linux git.)
Would be very happy for any feedback.
Regards,
Andreas Henriksson
>From fa4353c571af1708671e497b9c3562ebf98c4439 Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andr...@fatal.se>
Date: Wed, 6 May 2015 17:27:38 +0200
Subject: [PATCH] Let util-linux provide sulogin, last, lastb, mesg
---
debian/control | 4 +++-
debian/sysvinit-utils.install | 7 -------
debian/sysvinit-utils.links | 1 -
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/debian/control b/debian/control
index 1df5d16..feb12fb 100644
--- a/debian/control
+++ b/debian/control
@@ -71,7 +71,9 @@ Description: System-V-like utilities
This package contains the important System-V-like utilities.
.
Specifically, this package includes:
- killall5, last, lastb, mesg, pidof, service, sulogin
+ killall5, pidof, service
+# sulogin, last, lastb and mesg was moved to the mount package (src:util-linux)
+ util-linux (>= 2.26.2-3)
Package: sysv-rc
Architecture: all
diff --git a/debian/sysvinit-utils.install b/debian/sysvinit-utils.install
index 30e1f09..c8b4f07 100644
--- a/debian/sysvinit-utils.install
+++ b/debian/sysvinit-utils.install
@@ -1,14 +1,7 @@
sbin/fstab-decode
sbin/killall5
-sbin/sulogin
-usr/bin/last
-usr/bin/mesg
-usr/share/man/man1/last.1
-usr/share/man/man1/lastb.1
-usr/share/man/man1/mesg.1
usr/share/man/man8/fstab-decode.8
usr/share/man/man8/killall5.8
usr/share/man/man8/pidof.8
-usr/share/man/man8/sulogin.8
debian/service/service usr/sbin/
debian/init-d-script lib/init
diff --git a/debian/sysvinit-utils.links b/debian/sysvinit-utils.links
index cc2dfff..f49b40e 100644
--- a/debian/sysvinit-utils.links
+++ b/debian/sysvinit-utils.links
@@ -1,2 +1 @@
sbin/killall5 bin/pidof
-usr/bin/last usr/bin/lastb
--
2.1.4
>From 710234b3ae75479c586404d622fa7df21ea401e8 Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andr...@fatal.se>
Date: Wed, 6 May 2015 17:52:26 +0200
Subject: [PATCH] util-linux: ship sulogin, last, lastb, mesg utilities
These where previously shipped by sysvinit-utils (src:sysvinit).
---
debian/control | 4 ++--
debian/rules | 4 ----
debian/util-linux.install | 4 ++++
debian/util-linux.manpages | 4 ++++
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/debian/control b/debian/control
index 6da4e45..dcbd6c7 100644
--- a/debian/control
+++ b/debian/control
@@ -37,8 +37,8 @@ Essential: yes
Pre-Depends: ${misc:Pre-Depends}, ${shlibs:Depends}
Depends: initscripts, lsb-base (>= 3.0-6), tzdata (>=2006c-2), ${misc:Depends}
Suggests: dosfstools, kbd | console-tools, util-linux-locales
-Replaces: bash-completion (<< 1:2.1-3)
-Breaks: bash-completion (<< 1:2.1-3), grml-debootstrap (<< 0.68), cloud-utils (<< 0.27-1~)
+Replaces: bash-completion (<< 1:2.1-3), sysvinit-utils (<< 2.88dsf-59.1~)
+Breaks: bash-completion (<< 1:2.1-3), grml-debootstrap (<< 0.68), cloud-utils (<< 0.27-1~), sysvinit-utils (<< 2.88dsf-59.1~)
Multi-Arch: foreign
Description: Miscellaneous system utilities
This package contains a number of important utilities, most of which
diff --git a/debian/rules b/debian/rules
index 2584d63..218b71a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,10 +30,6 @@ CONFOPTS += --enable-libmount-force-mountinfo
CONFOPTS += --disable-login
CONFOPTS += --disable-nologin
CONFOPTS += --disable-su
-# => sysvinit-utils
-CONFOPTS += --disable-sulogin
-CONFOPTS += --disable-last
-CONFOPTS += --disable-mesg
# => procps
CONFOPTS += --disable-kill
# => eject
diff --git a/debian/util-linux.install b/debian/util-linux.install
index db55c9f..05b7e6e 100755
--- a/debian/util-linux.install
+++ b/debian/util-linux.install
@@ -27,6 +27,7 @@ sbin/mkfs.cramfs
sbin/mkfs.minix
sbin/runuser
sbin/sfdisk [!sparc]
+sbin/sulogin
sbin/swaplabel
sbin/wipefs
usr/bin/chrt
@@ -37,8 +38,11 @@ usr/bin/ipcmk
usr/bin/ipcrm
usr/bin/ipcs
usr/bin/isosize sbin/
+usr/bin/last
+usr/bin/lastb
usr/bin/line
usr/bin/mcookie
+usr/bin/mesg
usr/bin/mips [mips mipsel]
usr/bin/mips32 [mips mipsel]
usr/bin/mips64 [mips mipsel]
diff --git a/debian/util-linux.manpages b/debian/util-linux.manpages
index eeeb837..e35036f 100755
--- a/debian/util-linux.manpages
+++ b/debian/util-linux.manpages
@@ -15,8 +15,11 @@ debian/tmp/usr/share/man/man1/getopt.1
debian/tmp/usr/share/man/man1/ipcmk.1
debian/tmp/usr/share/man/man1/ipcrm.1
debian/tmp/usr/share/man/man1/ipcs.1
+debian/tmp/usr/share/man/man1/last.1
+debian/tmp/usr/share/man/man1/lastb.1
debian/tmp/usr/share/man/man1/line.1
debian/tmp/usr/share/man/man1/mcookie.1
+debian/tmp/usr/share/man/man1/mesg.1
debian/tmp/usr/share/man/man1/more.1
debian/tmp/usr/share/man/man1/namei.1
debian/tmp/usr/share/man/man1/pg.1
@@ -50,6 +53,7 @@ debian/tmp/usr/share/man/man8/ppc64.8 [powerpc ppc64 ppc64el]
debian/tmp/usr/share/man/man8/s390.8 [s390x]
debian/tmp/usr/share/man/man8/s390x.8 [s390x]
debian/tmp/usr/share/man/man8/sfdisk.8 [!sparc]
+debian/tmp/usr/share/man/man8/sulogin.8
debian/tmp/usr/share/man/man8/swaplabel.8
debian/tmp/usr/share/man/man8/wipefs.8
debian/tmp/usr/share/man/man8/x86_64.8 [amd64]
--
2.1.4
