Hi, Lets just keep it in there for now. If we do not have a fix by the end of the week, we can still revert it. This is a minor think now and I posted the workaround so that people can fix their testing systems if they like. -Michael > On 16 Feb 2021, at 18:13, Adolf Belka (ipfire-dev) wrote: > > Hi All, > > I think it should be un-merged from Core 155 and I will have a better look at the changes and do some better testing before submitting the v3 version of the patch. > > Sorry, > > Adolf > > > On 16/02/2021 17:18, Michael Tremer wrote: >> Hey, >> This doesn’t seem to work too well for me on my test system: >> After I installed the update, I got this: >> [root(a)ipfire ~]# reboot >> Broadcast message from root(a)ipfire.test.localdomain (console) (Tue Feb 16 17:00:09 2021): >> The system is going down for reboot NOW! >> shutdown: /run/initctl: No such file or directory >> init: /run/initctl: No such file or directory >> But the system did not want to reboot. It remained in run level 3. >> I linked /dev/initctl to /run/initctl and after that I could re-execute init: >> [root(a)ipfire ~]# ln -s /dev/initctl /run/initctl >> [root(a)ipfire ~]# telinit u >> INIT: version 2.25 reloading >> And successfuly reboot... >> [root(a)ipfire ~]# reboot >> INIT: No inittab.d directory found.test.localdomain (console) (Tue Feb 16 17:05: >> INIT: Sending processes configured via /etc/inittab the TERM signal >> INIT: Sending processeStopping fcron... [ OK ] >> After the reboot, /dev/initctl has been moved to /run/initctl and the system responds to reboot/shutdown commands as usual. >> What do we want to do here? Move that pipe back to /dev or are we happy with the update creating a symlink or moving it? >> -Michael >>> On 15 Feb 2021, at 13:15, Michael Tremer wrote: >>> >>> Hello, >>> >>> Thank you. This looks perfect. >>> >>> I merged it into next. >>> >>> -Michael >>> >>>> On 12 Feb 2021, at 17:59, Adolf Belka wrote: >>>> >>>> - Update sysvinit from 2.88dsf to 2.98 >>>> - From version 2.89 mounpoint build was not enabled as standard >>>> - Patch created to modify Makefile to define mountpoint to be built >>>> - Update of rootfiles >>>> - Changelog is ~400 lines long from 2.88dsf to 2.98 >>>> - For details see the Changelog in the doc directory in the tarball >>>> >>>> Signed-off-by: Adolf Belka >>>> --- >>>> config/rootfiles/common/sysvinit | 4 ++++ >>>> lfs/sysvinit | 7 ++++--- >>>> src/patches/sysvinit-2.98_build_mountpoint.patch | 12 ++++++++++++ >>>> 3 files changed, 20 insertions(+), 3 deletions(-) >>>> create mode 100644 src/patches/sysvinit-2.98_build_mountpoint.patch >>>> >>>> diff --git a/config/rootfiles/common/sysvinit b/config/rootfiles/common/sysvinit >>>> index ede5aa50d..0b389a7c3 100644 >>>> --- a/config/rootfiles/common/sysvinit >>>> +++ b/config/rootfiles/common/sysvinit >>>> @@ -1,5 +1,6 @@ >>>> bin/mountpoint >>>> bin/pidof >>>> +#etc/inittab.d >>>> #sbin/bootlogd >>>> #sbin/fstab-decode >>>> sbin/halt >>>> @@ -14,6 +15,7 @@ sbin/telinit >>>> usr/bin/last >>>> usr/bin/lastb >>>> usr/bin/mesg >>>> +#usr/bin/readbootlog >>>> usr/bin/utmpdump >>>> usr/bin/wall >>>> #usr/include/initreq.h >>>> @@ -21,8 +23,10 @@ usr/bin/wall >>>> #usr/share/man/man1/lastb.1 >>>> #usr/share/man/man1/mesg.1 >>>> #usr/share/man/man1/mountpoint.1 >>>> +#usr/share/man/man1/readbootlog.1 >>>> #usr/share/man/man1/utmpdump.1 >>>> #usr/share/man/man1/wall.1 >>>> +#usr/share/man/man5/initctl.5 >>>> #usr/share/man/man5/initscript.5 >>>> #usr/share/man/man5/inittab.5 >>>> #usr/share/man/man8/bootlogd.8 >>>> diff --git a/lfs/sysvinit b/lfs/sysvinit >>>> index 0306b5518..e7b715ea4 100644 >>>> --- a/lfs/sysvinit >>>> +++ b/lfs/sysvinit >>>> @@ -24,10 +24,10 @@ >>>> >>>> include Config >>>> >>>> -VER = 2.88dsf >>>> +VER = 2.98 >>>> >>>> THISAPP = sysvinit-$(VER) >>>> -DL_FILE = $(THISAPP).tar.bz2 >>>> +DL_FILE = $(THISAPP).tar.xz >>>> DL_FROM = $(URL_IPFIRE) >>>> DIR_APP = $(DIR_SRC)/$(THISAPP) >>>> TARGET = $(DIR_INFO)/$(THISAPP) >>>> @@ -40,7 +40,7 @@ objects = $(DL_FILE) >>>> >>>> $(DL_FILE) = $(DL_FROM)/$(DL_FILE) >>>> >>>> -$(DL_FILE)_MD5 = 6eda8a97b86e0a6f59dabbf25202aa6f >>>> +$(DL_FILE)_MD5 = e3254f7622ea5cf2322b1b386a98ba59 >>>> >>>> install : $(TARGET) >>>> >>>> @@ -72,6 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >>>> @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) >>>> # Newer C libraries omit this include from sys/types.h. >>>> # https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00018.html >>>> + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/sysvinit-2.98_build_mountpoint.patch >>>> cd $(DIR_APP) && sed -i src/mountpoint.c src/bootlogd.c \ >>>> -e "/include.*sys\/stat.h/a#include \n" >>>> cd $(DIR_APP) && sed -e "s/libcrypt.a/libcrypt.so/g" -i src/Makefile >>>> diff --git a/src/patches/sysvinit-2.98_build_mountpoint.patch b/src/patches/sysvinit-2.98_build_mountpoint.patch >>>> new file mode 100644 >>>> index 000000000..719eff558 >>>> --- /dev/null >>>> +++ b/src/patches/sysvinit-2.98_build_mountpoint.patch >>>> @@ -0,0 +1,12 @@ >>>> +diff -aup sysvinit-2.98/src/Makefile.orig sysvinit-2.98/src/Makefile >>>> +--- sysvinit-2.98/src/Makefile.orig 2021-02-12 14:31:56.325112868 +0100 >>>> ++++ sysvinit-2.98/src/Makefile 2021-02-12 14:31:56.257086870 +0100 >>>> +@@ -19,7 +19,7 @@ MANDB := s@^\('\\\\\"\)[^\*-]*-\*- codin >>>> + # Leave empty if the mountpoint(1) command from util-linux 2.20 >>>> + # and above should be used, otherwise set it to yes. >>>> + # >>>> +-MNTPOINT= >>>> ++MNTPOINT=yes >>>> + >>>> + # For some known distributions we do not build all programs, otherwise we do. >>>> + BIN = >>>> -- >>>> 2.30.1 >>>> >>>