Changeset cba2d4e for bootscripts/lfs

Timestamp:

04/03/2014 09:52:09 PM (10 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 7.6, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

9839808

Parents:

008436e

Message:

Added systemd and dbus to the book.
Set up systemd and System V side-by-side with the
ability to reboot to either system.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10520 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

bootscripts/lfs

Files:

• init.d/functions (deleted)
• init.d/localnet (modified) (1 diff)
• init.d/mountfs (modified) (1 diff)
• init.d/mountvirtfs (modified) (1 diff)
• init.d/rc (modified) (2 diffs)
• init.d/udev (modified) (1 diff)
• init.d/udev_retry (modified) (3 diffs)
• lib/services/init-functions (modified) (1 diff)
• lib/systemd/ifupdown@.service (added)
• units/ifupdownat.service (added)

bootscripts/lfs/init.d/localnet

@@ -29 +29 @@
 . /lib/lsb/init-functions
 [ -r /etc/sysconfig/network ] && . /etc/sysconfig/network
+[ -r /etc/hostname ] && HOSTNAME=`cat /etc/hostname`
 
 case "${1}" in

bootscripts/lfs/init.d/mountfs

@@ -40 +40 @@
       rm -f /fastboot /forcefsck
 
+      # Make sure /dev/pts exists
+      mkdir -p /dev/pts
+
       # This will mount all filesystems that do not have _netdev in
       # their option list.  _netdev denotes a network filesystem.

bootscripts/lfs/init.d/mountvirtfs

@@ -32 +32 @@
 case "${1}" in
    start)
-      # Make sure /run/var is available before logging any messages
+      # Make sure /run is available before logging any messages
       if ! mountpoint /run >/dev/null; then
          mount /run || failed=1
       fi
 
-      mkdir -p /run/var /run/lock /run/shm
+      mkdir -p /run/lock /run/shm
       chmod 1777 /run/shm
 

bootscripts/lfs/init.d/rc

@@ -218 +218 @@
 # Copy the boot log on initial boot only
 if [ "${previous}" == "N" -a  "${runlevel}" != "S" ]; then
-   cat /run/var/bootlog >> /var/log/boot.log
+   cat $BOOTLOG >> /var/log/boot.log
       
    # Mark the end of boot
@@ -224 +224 @@
    
    # Remove the temporary file
-   rm -f /run/var/bootlog 2> /dev/null
+   rm -f $BOOTLOG 2> /dev/null
 fi
 

bootscripts/lfs/init.d/udev

@@ -50 +50 @@
       # Start the udev daemon to continually watch for, and act on,
       # uevents
-      /sbin/udevd --daemon
+      /lib/systemd-udevd --daemon
 
       # Now traverse /sys in order to "coldplug" devices that have
       # already been discovered
-      /sbin/udevadm trigger --action=add    --type=subsystems
-      /sbin/udevadm trigger --action=add    --type=devices
-      /sbin/udevadm trigger --action=change --type=devices
+      /bin/udevadm trigger --action=add    --type=subsystems
+      /bin/udevadm trigger --action=add    --type=devices
+      /bin/udevadm trigger --action=change --type=devices
 
       # Now wait for udevd to process the uevents we triggered
       if ! is_true "$OMIT_UDEV_SETTLE"; then
-         /sbin/udevadm settle
+         /bin/udevadm settle
       fi
 

bootscripts/lfs/init.d/udev_retry

@@ -36 +36 @@
 
       # As of udev-186, the --run option is no longer valid
-      #rundir=$(/sbin/udevadm info --run)
+      #rundir=$(/bin/udevadm info --run)
       rundir=/run/udev
       # From Debian: "copy the rules generated before / was mounted
@@ -53 +53 @@
       while read line ; do
          for subsystem in $line ; do
-            /sbin/udevadm trigger --subsystem-match=$subsystem --action=add
+            /bin/udevadm trigger --subsystem-match=$subsystem --action=add
          done
       done
@@ -59 +59 @@
       # Now wait for udevd to process the uevents we triggered
       if ! is_true "$OMIT_UDEV_RETRY_SETTLE"; then
-         /sbin/udevadm settle
+         /bin/udevadm settle
       fi
 

bootscripts/lfs/lib/services/init-functions

@@ -72 +72 @@
 WARNING_SUFFIX="${BRACKET}[${WARNING} WARN ${BRACKET}]${NORMAL}"
 
-BOOTLOG=/run/var/bootlog
+BOOTLOG=/run/bootlog
 KILLDELAY=3