Changeset 02776dff


Ignore:
Timestamp:
01/13/2021 08:44:28 AM (3 years ago)
Author:
Xi Ruoyao <xry111@…>
Branches:
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, 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:
704e800
Parents:
a892a14
Message:

use /run for runtime state directories

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

Files:
13 edited

Legend:

Unmodified
Added
Removed

  • bootscripts/ChangeLog

    ra892a14 r02776dff  
     12021-01-13 Xi Ruoyao <xry111@mengyan1223.wang>
     2   * Use /run instead of deprecated /var/run
     3
    142020-10-02 DJ Lucas <dj@linuxfromscratch.org>
    25   * make $local_fs a Should-Stop dependency of swap to allow clean install

  • bootscripts/lfs/init.d/cleanfs

    ra892a14 r02776dff  
    2222# Default-Stop:
    2323# Short-Description:   Cleans temporary directories early in the boot process.
    24 # Description:         Cleans temporary directories /var/run, /var/lock, and
    25 #                      optionally, /tmp.  cleanfs also creates /var/run/utmp
     24# Description:         Cleans temporary directories /run, /var/lock, and
     25#                      optionally, /tmp.  cleanfs also creates /run/utmp
    2626#                      and any files defined in /etc/sysconfig/createfiles.
    2727# X-LFS-Provided-By:   LFS
    … …  
    9696      fi
    9797
    98       > /var/run/utmp
     98      > /run/utmp
    9999
    100100      if grep -q '^utmp:' /etc/group ; then
    101          chmod 664 /var/run/utmp
    102          chgrp utmp /var/run/utmp
     101         chmod 664 /run/utmp
     102         chgrp utmp /run/utmp
    103103      fi
    104104

  • bootscripts/lfs/init.d/rc

    ra892a14 r02776dff  
    143143
    144144# Read the state file if it exists from runlevel S
    145 [ -r /var/run/interactive ] && source /var/run/interactive
     145[ -r /run/interactive ] && source /run/interactive
    146146
    147147# Attempt to stop all services started by the previous runlevel,
    … …  
    218218# Store interactive variable on switch from runlevel S and remove if not
    219219if [ "${runlevel}" == "S" -a "${interactive}" == "i" ]; then
    220     echo "interactive=\"i\"" > /var/run/interactive
     220    echo "interactive=\"i\"" > /run/interactive
    221221else
    222     rm -f /var/run/interactive 2> /dev/null
     222    rm -f /run/interactive 2> /dev/null
    223223fi
    224224

  • bootscripts/lfs/lib/services/init-functions

    ra892a14 r02776dff  
    359359            progname=`echo "${program}" | sed "s@${prefix}@@"`
    360360
    361             if [ -e "/var/run/${progname}.pid" ]; then
    362                 rm -f "/var/run/${progname}.pid" 2> /dev/null
     361            if [ -e "/run/${progname}.pid" ]; then
     362                rm -f "/run/${progname}.pid" 2> /dev/null
    363363            fi
    364364        else
    … …  
    435435
    436436        # If a PID file exists with that name, assume that is it.
    437         if [ -e "/var/run/${progname}.pid" ]; then
    438             pidfile="/var/run/${progname}.pid"
     437        if [ -e "/run/${progname}.pid" ]; then
     438            pidfile="/run/${progname}.pid"
    439439        fi
    440440    fi
    … …  
    529529         "ID(s) ${pidlist}.${NORMAL}"
    530530   else
    531       if [ -n "${base}" -a -e "/var/run/${base}.pid" ]; then
     531      if [ -n "${base}" -a -e "/run/${base}.pid" ]; then
    532532         /bin/echo -e "${WARNING}${1} is not running but" \
    533             "/var/run/${base}.pid exists.${NORMAL}"
     533            "/run/${base}.pid exists.${NORMAL}"
    534534      else
    535535         if [ -n "${pidfile}" -a -e "${pidfile}" ]; then

  • chapter01/changelog.xml

    ra892a14 r02776dff  
    4444    -->
    4545    <listitem>
     46      <para>2021-01-13</para>
     47      <itemizedlist>
     48        <listitem revision="systemd">
     49          <para>[xry111] - Fix util-linux uuidd socket path.</para>
     50        </listitem>
     51        <listitem>
     52          <para>[xry111] - Remove various references to deprecated
     53          /var/run, use /run insteadly.</para>
     54        </listitem>
     55        <listitem revision="sysv">
     56          <para>[xry111] - Update to lfs-bootscripts-20210113.</para>
     57        </listitem>
     58      </itemizedlist>
     59    </listitem>
     60
     61    <listitem>
    4662      <itemizedlist>
    4763      <para>2021-01-01</para>

  • chapter07/createfiles.xml

    ra892a14 r02776dff  
    2020
    2121  <indexterm zone="ch-tools-createfiles">
    22     <primary sortas="e-/var/run/utmp">/var/run/utmp</primary>
     22    <primary sortas="e-/run/utmp">/run/utmp</primary>
    2323  </indexterm>
    2424
    … …  
    7070bin:x:1:1:bin:/dev/null:/bin/false
    7171daemon:x:6:6:Daemon User:/dev/null:/bin/false
    72 messagebus:x:18:18:D-Bus Message Daemon User:/var/run/dbus:/bin/false
     72messagebus:x:18:18:D-Bus Message Daemon User:/run/dbus:/bin/false
    7373systemd-bus-proxy:x:72:72:systemd Bus Proxy:/:/bin/false
    7474systemd-journal-gateway:x:73:73:systemd Journal Gateway:/:/bin/false

  • chapter07/util-linux.xml

    ra892a14 r02776dff  
    5959            --disable-pylibmount \
    6060            --disable-static     \
    61             --without-python</userinput></screen>
     61            --without-python     \
     62            runstatedir=/run</userinput></screen>
    6263
    6364    <variablelist>
    … …  
    9192      </varlistentry>
    9293
     94      <varlistentry>
     95        <term><parameter>runstatedir=/run</parameter></term>
     96        <listitem>
     97          <para>This switch sets the location of the socket used by
     98          <command>uuidd</command> and
     99          <filename class="libraryfile">libuuid</filename> correctly.</para>
     100        </listitem>
     101      </varlistentry>
     102
    93103     </variablelist>
    94104

  • chapter08/systemd.xml

    ra892a14 r02776dff  
    473473        <listitem>
    474474          <para>Outputs the previous and the current run-level, as noted in the
    475           last run-level record in <filename>/var/run/utmp</filename></para>
     475          last run-level record in <filename>/run/utmp</filename></para>
    476476          <indexterm zone="ch-system-systemd runlevel">
    477477            <primary sortas="b-runlevel">runlevel</primary>

  • chapter08/sysvinit.xml

    ra892a14 r02776dff  
    186186        <listitem>
    187187          <para>Reports the previous and the current run-level, as noted in the
    188           last run-level record in <filename>/var/run/utmp</filename></para>
     188          last run-level record in <filename>/run/utmp</filename></para>
    189189          <indexterm zone="ch-system-sysvinit runlevel-sysv">
    190190            <primary sortas="b-runlevel">runlevel</primary>

  • chapter08/util-linux.xml

    ra892a14 r02776dff  
    7777            --disable-pylibmount \
    7878            --disable-static     \
    79             --without-python</userinput></screen>
     79            --without-python     \
     80            runstatedir=/run</userinput></screen>
    8081
    8182    <para>The --disable and --without options prevent warnings about

  • chapter09/bootscripts.xml

    ra892a14 r02776dff  
    8686        <listitem>
    8787          <para>Removes files that should not be preserved between reboots, such
    88           as those in <filename class="directory">/var/run/</filename> and
     88          as those in <filename class="directory">/run/</filename> and
    8989          <filename class="directory">/var/lock/</filename>; it re-creates
    90           <filename>/var/run/utmp</filename> and removes the possibly present
     90          <filename>/run/utmp</filename> and removes the possibly present
    9191          <filename>/etc/nologin</filename>, <filename>/fastboot</filename>, and
    9292          <filename>/forcefsck</filename> files</para>

  • general.ent

    ra892a14 r02776dff  
    1 <!ENTITY version         "SVN-20210101">
     1<!ENTITY version         "SVN-20210113">
    22<!ENTITY short-version   "svn">  <!-- Used below in &blfs-book;
    33                                      Change to x.y for release but not -rc releases -->
    44<!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
    55
    6 <!ENTITY versiond        "20210101-systemd">
     6<!ENTITY versiond        "20210113-systemd">
    77<!ENTITY short-versiond  "systemd">
    88<!ENTITY generic-versiond "systemd">
    99
    10 <!ENTITY releasedate     "January 1st, 2021">
     10<!ENTITY releasedate     "January 13th, 2021">
    1111
    1212<!ENTITY copyrightdate   "1999-2021"><!-- jhalfs needs a literal dash, not &ndash; -->

  • packages.ent

    ra892a14 r02776dff  
    376376<!ENTITY less-fin-sbu "less than 0.1 SBU">
    377377
    378 <!ENTITY lfs-bootscripts-version "20201019">      <!-- Scripts depend on this format -->
     378<!ENTITY lfs-bootscripts-version "20210113">      <!-- Scripts depend on this format -->
    379379<!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">       
    380380<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz">
Note: See TracChangeset for help on using the changeset viewer.