Fix sysvinit problems with new patches

diff --git a/stage1/pkg/sysvinit b/stage1/pkg/sysvinit
index 8181981..005bd1c 100644 (file)
--- a/stage1/pkg/sysvinit
+++ b/stage1/pkg/sysvinit
@@ -4,15 +4,12 @@ hvbuild()
 {
     cd ${LFS_TMP}/${PACKAGE}
 
-    sed -e 's@root@0@g' \
-        -e "s@/dev/initctl@${CLFS}&@g" \
-        -e 's@\(mknod \)-m \([0-9]* \)\(.* \)p@\1\3p; chmod \2\3@g' \
-        -e "s@/usr/lib@/tools/lib@" \
+    sed -e "s@/usr/lib@/tools/lib@" \
         -i src/Makefile
 
     make -C src clobber
     make -C src CC="${CC} ${BUILD64}"
     make -C src install INSTALL=install ROOT=${LFS}
-    
+
     install -v -m644 ${SCRDIR}/misc/inittab ${LFS}/etc
 }

diff --git a/stage2/pkg/sysvinit b/stage2/pkg/sysvinit
index 4ca834e..4882a69 100644 (file)
--- a/stage2/pkg/sysvinit
+++ b/stage2/pkg/sysvinit
@@ -1,19 +1,8 @@
 #!/bin/bash
 
-hvconfig_pre()
-{
-    cd ${LFS_TMP}/${PACKAGE}
-
-    sed -i 's@Sending processes@& configured via /etc/inittab@g' src/init.c
-
-    # A maintained version of the wall program was installed earlier by
-    # Util-linux-ng. Suppress the installation of Sysvinit's version:
-    sed -i -e 's/utmpdump wall/utmpdump/' \
-        -e 's/mountpoint.1 wall.1/mountpoint.1/' src/Makefile
-}
-
 hvbuild()
 {
+    cd ${LFS_TMP}/${PACKAGE}
     make -j ${MAKEJOBS} -C src
     make -C src install
 }