From 6903d5eff32738868d4ada9a7749820f3e1aafb2 Mon Sep 17 00:00:00 2001 From: DJ Lucas Date: Mon, 2 Sep 2019 08:53:46 +0000 Subject: Update to LFS-Bootscripts-20190902 git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11666 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- bootscripts/ChangeLog | 3 +++ bootscripts/lfs/init.d/checkfs | 2 +- bootscripts/lfs/init.d/console | 4 ++-- bootscripts/lfs/init.d/localnet | 4 ++-- bootscripts/lfs/init.d/modules | 2 +- bootscripts/lfs/init.d/mountfs | 2 +- bootscripts/lfs/init.d/mountvirtfs | 2 +- bootscripts/lfs/init.d/sysctl | 2 +- bootscripts/lfs/init.d/sysklogd | 8 ++++---- bootscripts/lfs/init.d/udev | 2 +- bootscripts/lfs/init.d/udev_retry | 2 +- chapter01/changelog.xml | 7 ++++++- packages.ent | 2 +- prologue/standards.xml | 4 ++-- 14 files changed, 27 insertions(+), 19 deletions(-) diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog index 5a809d1b8..6017bb965 100644 --- a/bootscripts/ChangeLog +++ b/bootscripts/ChangeLog @@ -1,3 +1,6 @@ +2019-09-02 DJ Lucas + * Update facilities in LSB headers + 2015-06-24 Bruce Dubbs * Unmount network file systems before bringing down the network * Spell out some mount/umount options diff --git a/bootscripts/lfs/init.d/checkfs b/bootscripts/lfs/init.d/checkfs index 2ab1bf119..42fce219a 100644 --- a/bootscripts/lfs/init.d/checkfs +++ b/bootscripts/lfs/init.d/checkfs @@ -27,7 +27,7 @@ ### BEGIN INIT INFO # Provides: checkfs -# Required-Start: udev swap $time +# Required-Start: udev swap # Should-Start: # Required-Stop: # Should-Stop: diff --git a/bootscripts/lfs/init.d/console b/bootscripts/lfs/init.d/console index 1a4921005..58c3cbf39 100644 --- a/bootscripts/lfs/init.d/console +++ b/bootscripts/lfs/init.d/console @@ -15,8 +15,8 @@ ### BEGIN INIT INFO # Provides: console -# Required-Start: -# Should-Start: $local_fs +# Required-Start: $local_fs +# Should-Start: # Required-Stop: # Should-Stop: # Default-Start: S diff --git a/bootscripts/lfs/init.d/localnet b/bootscripts/lfs/init.d/localnet index 4b85a987f..0cb3a7c5a 100644 --- a/bootscripts/lfs/init.d/localnet +++ b/bootscripts/lfs/init.d/localnet @@ -14,8 +14,8 @@ ### BEGIN INIT INFO # Provides: localnet -# Required-Start: $local_fs -# Should-Start: +# Required-Start: +# Should-Start: modules # Required-Stop: # Should-Stop: # Default-Start: S diff --git a/bootscripts/lfs/init.d/modules b/bootscripts/lfs/init.d/modules index cab5cfadd..eabcde5a2 100644 --- a/bootscripts/lfs/init.d/modules +++ b/bootscripts/lfs/init.d/modules @@ -14,7 +14,7 @@ ### BEGIN INIT INFO # Provides: modules -# Required-Start: mountvirtfs sysctl +# Required-Start: mountvirtfs # Should-Start: # Required-Stop: # Should-Stop: diff --git a/bootscripts/lfs/init.d/mountfs b/bootscripts/lfs/init.d/mountfs index ee7dcf5f7..4cb37c61f 100644 --- a/bootscripts/lfs/init.d/mountfs +++ b/bootscripts/lfs/init.d/mountfs @@ -15,7 +15,7 @@ ### BEGIN INIT INFO # Provides: $local_fs # Required-Start: udev checkfs -# Should-Start: +# Should-Start: modules # Required-Stop: swap # Should-Stop: # Default-Start: S diff --git a/bootscripts/lfs/init.d/mountvirtfs b/bootscripts/lfs/init.d/mountvirtfs index 65b87b0f0..e642546df 100644 --- a/bootscripts/lfs/init.d/mountvirtfs +++ b/bootscripts/lfs/init.d/mountvirtfs @@ -14,7 +14,7 @@ ### BEGIN INIT INFO # Provides: mountvirtfs -# Required-Start: +# Required-Start: $first # Should-Start: # Required-Stop: # Should-Stop: diff --git a/bootscripts/lfs/init.d/sysctl b/bootscripts/lfs/init.d/sysctl index 3c3722cd7..c90da9de2 100644 --- a/bootscripts/lfs/init.d/sysctl +++ b/bootscripts/lfs/init.d/sysctl @@ -17,7 +17,7 @@ ### BEGIN INIT INFO # Provides: sysctl # Required-Start: mountvirtfs -# Should-Start: +# Should-Start: console # Required-Stop: # Should-Stop: # Default-Start: S diff --git a/bootscripts/lfs/init.d/sysklogd b/bootscripts/lfs/init.d/sysklogd index 2c2a9dd06..ecedd4413 100644 --- a/bootscripts/lfs/init.d/sysklogd +++ b/bootscripts/lfs/init.d/sysklogd @@ -16,10 +16,10 @@ # Provides: $syslog # Required-Start: localnet # Should-Start: -# Required-Stop: $local_fs sendsignals -# Should-Stop: -# Default-Start: 3 4 5 -# Default-Stop: 0 1 2 6 +# Required-Stop: $local_fs +# Should-Stop: sendsignals +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 # Short-Description: Starts kernel and system log daemons. # Description: Starts kernel and system log daemons. # /etc/fstab. diff --git a/bootscripts/lfs/init.d/udev b/bootscripts/lfs/init.d/udev index ba0f7c88f..1ec053623 100644 --- a/bootscripts/lfs/init.d/udev +++ b/bootscripts/lfs/init.d/udev @@ -14,7 +14,7 @@ ### BEGIN INIT INFO # Provides: udev $time -# Required-Start: +# Required-Start: localnet # Should-Start: modules # Required-Stop: # Should-Stop: diff --git a/bootscripts/lfs/init.d/udev_retry b/bootscripts/lfs/init.d/udev_retry index c921fc451..2b0953369 100644 --- a/bootscripts/lfs/init.d/udev_retry +++ b/bootscripts/lfs/init.d/udev_retry @@ -16,7 +16,7 @@ ### BEGIN INIT INFO # Provides: udev_retry # Required-Start: udev -# Should-Start: $local_fs +# Should-Start: $local_fs modules # Required-Stop: # Should-Stop: # Default-Start: S diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 403e43c6d..af9c47066 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -47,7 +47,7 @@ 2019-09-02 - [bdubbs] - Update to linux-5.2.4. Fixes + [bdubbs] - Update to linux-5.2.11. Fixes #4517. @@ -62,6 +62,11 @@ [bdubbs] - Update to findutils-4.7.0. Fixes #4520. + + [dj] - Update to LFS-Bootscripts-20190902 - correct LSB + dependency information in bootscripts and update standards page for + new LSB-Tools package. + diff --git a/packages.ent b/packages.ent index b073e0503..f2e1c5b26 100644 --- a/packages.ent +++ b/packages.ent @@ -380,7 +380,7 @@ - + diff --git a/prologue/standards.xml b/prologue/standards.xml index cda3014f6..16c4de1dd 100644 --- a/prologue/standards.xml +++ b/prologue/standards.xml @@ -106,8 +106,8 @@ LSB Core: - At, Batch (a part of At), Cpio, Ed, Fcrontab, Initd-tools, - Lsb_release, NSPR, NSS, PAM, Pax, Sendmail (or Postfix or Exim), time + At, Batch (a part of At), Cpio, Ed, Fcrontab, LSB-Tools, NSPR, + NSS, PAM, Pax, Sendmail (or Postfix or Exim), time -- cgit v1.2.3-54-g00ecf