sysvinit: aligned with upstream

diff --git a/sysvinit/.footprint b/sysvinit/.footprint
index ad02aa92b2dded7dc2e2d616d0e730c632f9a130..77505ef41a25ab1c5b43381a524c0af83fdb14b8 100644 (file)
--- a/sysvinit/.footprint
+++ b/sysvinit/.footprint
@@ -1,5 +1,4 @@
 drwxr-xr-x     root/root       bin/
--rwxr-xr-x     root/root       bin/mountpoint
 lrwxrwxrwx     root/root       bin/pidof -> /sbin/killall5
 drwxr-xr-x     root/root       sbin/
 -rwxr-xr-x     root/root       sbin/bootlogd
@@ -18,7 +17,6 @@ drwxr-xr-x    root/root       usr/bin/
 -rwxr-xr-x     root/root       usr/bin/last
 lrwxrwxrwx     root/root       usr/bin/lastb -> last
 -rwxr-xr-x     root/root       usr/bin/mesg
--rwxr-xr-x     root/root       usr/bin/utmpdump
 -rwxr-xr-x     root/root       usr/bin/wall
 drwxr-xr-x     root/root       usr/include/
 -rw-r--r--     root/root       usr/include/initreq.h
@@ -27,8 +25,6 @@ drwxr-xr-x    root/root       usr/man/man1/
 -rw-r--r--     root/root       usr/man/man1/last.1.gz
 -rw-r--r--     root/root       usr/man/man1/lastb.1.gz
 -rw-r--r--     root/root       usr/man/man1/mesg.1.gz
--rw-r--r--     root/root       usr/man/man1/mountpoint.1.gz
--rw-r--r--     root/root       usr/man/man1/utmpdump.1.gz
 -rw-r--r--     root/root       usr/man/man1/wall.1.gz
 drwxr-xr-x     root/root       usr/man/man5/
 -rw-r--r--     root/root       usr/man/man5/initscript.5.gz

diff --git a/sysvinit/Pkgfile b/sysvinit/Pkgfile
index 9a9782161849d5246a60474447065028d923c81c..4f6cca54fc73d3a7f06471dfb8528767bcdc9acf 100644 (file)
--- a/sysvinit/Pkgfile
+++ b/sysvinit/Pkgfile
@@ -13,6 +13,10 @@ build() {
   cd $name-${version}dsf
   make -C src CC="$CC"
   make -C src ROOT=$PKG MANDIR=/usr/man install
+  # Provided by util-linux
+  rm $PKG/{bin/mountpoint,usr/bin/utmpdump}
+  rm $PKG/usr/man/man1/{mountpoint,utmpdump}.1
+
   install -d $PKG/var/log
   touch $PKG/var/log/wtmp
   touch $PKG/var/log/btmp