sysvinit 2.96

system/base/sysvinit/actions.py

@@ -9,7 +9,7 @@ from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import get
 
-WorkDir = "sysvinit-%sdsf" % get.srcVERSION()
+WorkDir = "sysvinit-%s" % get.srcVERSION()
 
 def build():
     autotools.make("-C src CC=\"%s\" CFLAGS=\"%s -D_GNU_SOURCE\" LCRYPT=\"-lcrypt\"" % (get.CC(), get.CFLAGS()))
@@ -19,4 +19,8 @@ def install():
     autotools.rawInstall("ROOT='%s' STRIP=/bin/true" % get.installDIR())
 
     pisitools.remove("/bin/pidof")
+    # These files conflict with e2fsprogs
+    pisitools.remove("/sbin/logsave")
+    pisitools.remove("/usr/share/man/man8/logsave.8")
+    
     pisitools.dosym("killall5", "/sbin/pidof")