sysvinit: Update to 2.98

Message ID 20210211124104.3661920-1-adolf.belka@ipfire.org
State Superseded
Headers
Series sysvinit: Update to 2.98 |

Commit Message

Adolf Belka Feb. 11, 2021, 12:41 p.m. UTC
  - Update sysvinit from 2.88dsf to 2.98
- 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 <adolf.belka@ipfire.org>
---
 config/rootfiles/common/sysvinit | 6 ++++--
 lfs/sysvinit                     | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)
  

Comments

Michael Tremer Feb. 12, 2021, 12:02 p.m. UTC | #1
Hello,

This patch removes “mountpoint” which we use in quite a number of scripts.

Has this been removed for good? Can we replace it?

-Michael

> On 11 Feb 2021, at 12:41, Adolf Belka <adolf.belka@ipfire.org> wrote:
> 
> - Update sysvinit from 2.88dsf to 2.98
> - 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 <adolf.belka@ipfire.org>
> ---
> config/rootfiles/common/sysvinit | 6 ++++--
> lfs/sysvinit                     | 6 +++---
> 2 files changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/config/rootfiles/common/sysvinit b/config/rootfiles/common/sysvinit
> index ede5aa50d..a6fb1fd04 100644
> --- a/config/rootfiles/common/sysvinit
> +++ b/config/rootfiles/common/sysvinit
> @@ -1,5 +1,5 @@
> -bin/mountpoint
> bin/pidof
> +#etc/inittab.d
> #sbin/bootlogd
> #sbin/fstab-decode
> sbin/halt
> @@ -14,15 +14,17 @@ sbin/telinit
> usr/bin/last
> usr/bin/lastb
> usr/bin/mesg
> +#usr/bin/readbootlog
> usr/bin/utmpdump
> usr/bin/wall
> #usr/include/initreq.h
> #usr/share/man/man1/last.1
> #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..93ee98f51 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)
> 
> -- 
> 2.30.1
>
  
Adolf Belka Feb. 12, 2021, 12:49 p.m. UTC | #2
Hi Michael,

On 12/02/2021 13:02, Michael Tremer wrote:
> Hello,
> 
> This patch removes “mountpoint” which we use in quite a number of scripts.
> 
> Has this been removed for good? Can we replace it?

Had a look through the changelog and in 2.89 it mentions that mountpount is no longer built/used by default because distributions are using util-linux's mountpoint. So it should be possible to get it back in. I will investigate further.

Regards,

Adolf
> 
> -Michael
> 
>> On 11 Feb 2021, at 12:41, Adolf Belka <adolf.belka@ipfire.org> wrote:
>>
>> - Update sysvinit from 2.88dsf to 2.98
>> - 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 <adolf.belka@ipfire.org>
>> ---
>> config/rootfiles/common/sysvinit | 6 ++++--
>> lfs/sysvinit                     | 6 +++---
>> 2 files changed, 7 insertions(+), 5 deletions(-)
>>
>> diff --git a/config/rootfiles/common/sysvinit b/config/rootfiles/common/sysvinit
>> index ede5aa50d..a6fb1fd04 100644
>> --- a/config/rootfiles/common/sysvinit
>> +++ b/config/rootfiles/common/sysvinit
>> @@ -1,5 +1,5 @@
>> -bin/mountpoint
>> bin/pidof
>> +#etc/inittab.d
>> #sbin/bootlogd
>> #sbin/fstab-decode
>> sbin/halt
>> @@ -14,15 +14,17 @@ sbin/telinit
>> usr/bin/last
>> usr/bin/lastb
>> usr/bin/mesg
>> +#usr/bin/readbootlog
>> usr/bin/utmpdump
>> usr/bin/wall
>> #usr/include/initreq.h
>> #usr/share/man/man1/last.1
>> #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..93ee98f51 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)
>>
>> -- 
>> 2.30.1
>>
>
  
Michael Tremer Feb. 12, 2021, 1:51 p.m. UTC | #3
Hi,

> On 12 Feb 2021, at 12:49, Adolf Belka (ipfire-dev) <adolf.belka@ipfire.org> wrote:
> 
> Hi Michael,
> 
> On 12/02/2021 13:02, Michael Tremer wrote:
>> Hello,
>> This patch removes “mountpoint” which we use in quite a number of scripts.
>> Has this been removed for good? Can we replace it?
> 
> Had a look through the changelog and in 2.89 it mentions that mountpount is no longer built/used by default because distributions are using util-linux's mountpoint. So it should be possible to get it back in. I will investigate further.

Yes that sounds about right. Some of these tools have been moved to util-linux or to coreutils. Sometimes they need to be enabled with a switch when running configure. A patch that enables mountpoint on one of them will be fine and I can merge sysvinit then.

:)

-Michael

> 
> Regards,
> 
> Adolf
>> -Michael
>>> On 11 Feb 2021, at 12:41, Adolf Belka <adolf.belka@ipfire.org> wrote:
>>> 
>>> - Update sysvinit from 2.88dsf to 2.98
>>> - 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 <adolf.belka@ipfire.org>
>>> ---
>>> config/rootfiles/common/sysvinit | 6 ++++--
>>> lfs/sysvinit                     | 6 +++---
>>> 2 files changed, 7 insertions(+), 5 deletions(-)
>>> 
>>> diff --git a/config/rootfiles/common/sysvinit b/config/rootfiles/common/sysvinit
>>> index ede5aa50d..a6fb1fd04 100644
>>> --- a/config/rootfiles/common/sysvinit
>>> +++ b/config/rootfiles/common/sysvinit
>>> @@ -1,5 +1,5 @@
>>> -bin/mountpoint
>>> bin/pidof
>>> +#etc/inittab.d
>>> #sbin/bootlogd
>>> #sbin/fstab-decode
>>> sbin/halt
>>> @@ -14,15 +14,17 @@ sbin/telinit
>>> usr/bin/last
>>> usr/bin/lastb
>>> usr/bin/mesg
>>> +#usr/bin/readbootlog
>>> usr/bin/utmpdump
>>> usr/bin/wall
>>> #usr/include/initreq.h
>>> #usr/share/man/man1/last.1
>>> #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..93ee98f51 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)
>>> 
>>> -- 
>>> 2.30.1
>>>
  

Patch

diff --git a/config/rootfiles/common/sysvinit b/config/rootfiles/common/sysvinit
index ede5aa50d..a6fb1fd04 100644
--- a/config/rootfiles/common/sysvinit
+++ b/config/rootfiles/common/sysvinit
@@ -1,5 +1,5 @@ 
-bin/mountpoint
 bin/pidof
+#etc/inittab.d
 #sbin/bootlogd
 #sbin/fstab-decode
 sbin/halt
@@ -14,15 +14,17 @@  sbin/telinit
 usr/bin/last
 usr/bin/lastb
 usr/bin/mesg
+#usr/bin/readbootlog
 usr/bin/utmpdump
 usr/bin/wall
 #usr/include/initreq.h
 #usr/share/man/man1/last.1
 #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..93ee98f51 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)