Changeset 095d076 for networking

Timestamp:

05/17/2021 04:12:58 PM (3 years ago)

Author:

Ken Moffat <ken@…>

Branches:

11.0, 11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

ff056c7

Parents:

58a83256

Message:

Fix dhcp for merged usr.

Prompted by:
mv: '/usr/sbin/dhclient' and '/sbin/dhclient' are the same file

File:

• networking/connect/dhcp.xml (modified) (3 diffs)

networking/connect/dhcp.xml

@@ -167 +167 @@
 -->
 <screen><userinput>( export CFLAGS="${CFLAGS:--g -O2} -Wall -fno-strict-aliasing                 \
-        -D_PATH_DHCLIENT_SCRIPT='\"/sbin/dhclient-script\"'         \
+        -D_PATH_DHCLIENT_SCRIPT='\"/usr/sbin/dhclient-script\"'     \
         -D_PATH_DHCPD_CONF='\"/etc/dhcp/dhcpd.conf\"'               \
         -D_PATH_DHCLIENT_CONF='\"/etc/dhcp/dhclient.conf\"'"        &amp;&amp;
@@ -192 +192 @@
     </para>
 
-<screen role="root"><userinput>make -C client install         &amp;&amp;
-mv -v /usr/sbin/dhclient /sbin &amp;&amp;
-install -v -m755 client/scripts/linux /sbin/dhclient-script</userinput></screen>
+<screen role="root"><userinput>make -C client install             &amp;&amp;
+install -v -m755 client/scripts/linux /usr/sbin/dhclient-script</userinput></screen>
 
     <para>
@@ -220 +219 @@
     </para>
 
-<screen role="root"><userinput>make install                   &amp;&amp;
-mv -v /usr/sbin/dhclient /sbin &amp;&amp;
-install -v -m755 client/scripts/linux /sbin/dhclient-script</userinput></screen>
+<screen role="root"><userinput>make install &amp;&amp;
+install -v -m755 client/scripts/linux /usr/sbin/dhclient-script</userinput></screen>
 
   </sect2>