Ignore:
Timestamp:
05/17/2021 04:12:58 PM (2 months ago)
Author:
Ken Moffat <ken@…>
Branches:
trunk
Children:
ff056c7
Parents:
58a83256
Message:

Fix dhcp for merged usr.

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • networking/connect/dhcp.xml

    r58a83256 r095d076  
    167167-->
    168168<screen><userinput>( export CFLAGS="${CFLAGS:--g -O2} -Wall -fno-strict-aliasing                 \
    169         -D_PATH_DHCLIENT_SCRIPT='\"/sbin/dhclient-script\"'         \
     169        -D_PATH_DHCLIENT_SCRIPT='\"/usr/sbin/dhclient-script\"'     \
    170170        -D_PATH_DHCPD_CONF='\"/etc/dhcp/dhcpd.conf\"'               \
    171171        -D_PATH_DHCLIENT_CONF='\"/etc/dhcp/dhclient.conf\"'"        &amp;&amp;
     
    192192    </para>
    193193
    194 <screen role="root"><userinput>make -C client install         &amp;&amp;
    195 mv -v /usr/sbin/dhclient /sbin &amp;&amp;
    196 install -v -m755 client/scripts/linux /sbin/dhclient-script</userinput></screen>
     194<screen role="root"><userinput>make -C client install             &amp;&amp;
     195install -v -m755 client/scripts/linux /usr/sbin/dhclient-script</userinput></screen>
    197196
    198197    <para>
     
    220219    </para>
    221220
    222 <screen role="root"><userinput>make install                   &amp;&amp;
    223 mv -v /usr/sbin/dhclient /sbin &amp;&amp;
    224 install -v -m755 client/scripts/linux /sbin/dhclient-script</userinput></screen>
     221<screen role="root"><userinput>make install &amp;&amp;
     222install -v -m755 client/scripts/linux /usr/sbin/dhclient-script</userinput></screen>
    225223
    226224  </sect2>
Note: See TracChangeset for help on using the changeset viewer.