Ignore:
Timestamp:
07/18/2023 04:51:51 PM (10 months ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
12.0, 12.1, ken/TL2024, ken/tuningfonts, lazarus, plabs/newcss, python3.11, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18
Children:
6dfe4ab
Parents:
4048bc73 (diff), 5af5876 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'trunk' into lxqt

File:
1 edited

Legend:

Unmodified
Added
Removed
  • networking/netutils/networkmanager.xml

    r4048bc73 re77c478  
    99  <!ENTITY NetworkManager-download-ftp
    1010"&gnome-download-ftp;/NetworkManager/&NetworkManager-minor;/NetworkManager-&NetworkManager-version;.tar.xz">
    11   <!ENTITY NetworkManager-md5sum        "e2aa7bf567206a55b10f6b2e332c109e">
     11  <!ENTITY NetworkManager-md5sum        "e496a6af920e788fd39710799f88721a">
    1212  <!ENTITY NetworkManager-size          "6.4 MB">
    13   <!ENTITY NetworkManager-buildsize     "280 MB (with tests and documentation)">
    14   <!ENTITY NetworkManager-time          "0.8 SBU (with tests, using parallelism=4)">
     13  <!ENTITY NetworkManager-buildsize     "257 MB (with tests and documentation)">
     14  <!ENTITY NetworkManager-time          "0.7 SBU (with tests, using parallelism=4)">
    1515]>
    1616
     
    9292    <para role="recommended">
    9393      <xref linkend="curl"/>,
    94       <!--<xref linkend="dhcpcd"/> or
    95           DHCPCD support is known to be broken with dhcpcd-9 -->
    96       <xref role="nodep" linkend="dhcp"/> (client only),
     94      <xref linkend="dhcpcd"/>
    9795      <xref linkend="gobject-introspection"/>,
    9896      <xref linkend="iptables"/>,
     
    455453        To use something other than the built-in dhcp client (recommended if
    456454        using only <command>nmcli</command>), use the following configuration
    457         (valid values include either dhclient <!--dhcpcd --> or internal):
     455        (valid values include either dhcpcd or internal):
    458456      </para>
    459457
    460458<screen role="nodump"><userinput>cat &gt; /etc/NetworkManager/conf.d/dhcp.conf &lt;&lt; "EOF"
    461459<literal>[main]
    462 dhcp=</literal><replaceable>dhclient</replaceable>
     460dhcp=</literal><replaceable>dhcpcd</replaceable>
    463461EOF</userinput></screen>
    464462
Note: See TracChangeset for help on using the changeset viewer.