mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
rename to none conflicting network
This commit is contained in:
parent
89cf17422c
commit
94d91f9ff2
4 changed files with 4 additions and 4 deletions
|
@ -190,7 +190,7 @@ if [[ -e /usr/bin/setup ]]; then
|
|||
km && : >/tmp/.keymap
|
||||
fi
|
||||
if [[ ! -e /tmp/.network && ! -e "${_CACHEDIR}/archboot.db" ]]; then
|
||||
net && : >/tmp/.network
|
||||
network && : >/tmp/.network
|
||||
fi
|
||||
if ! [[ -e /tmp/.timezone ]]; then
|
||||
tz && : >/tmp/.timezone
|
||||
|
|
|
@ -101,7 +101,7 @@ _download_latest() {
|
|||
# helper binaries
|
||||
echo -e "\e[1mStep 2/4:\e[m Downloading latest scripts..."
|
||||
# main binaries
|
||||
BINS="quickinst setup km tz launcher net update copy-mountpoint rsync-backup restore-usbstick"
|
||||
BINS="quickinst setup km tz launcher network update copy-mountpoint rsync-backup restore-usbstick"
|
||||
for i in ${BINS}; do
|
||||
[[ -e "${_BIN}/${i}" ]] && wget -q "${_SOURCE}${_BIN}/archboot-${i}.sh?inline=false" -O "${_BIN}/${i}"
|
||||
done
|
||||
|
|
|
@ -18,7 +18,7 @@ if echo "${HOOKS[@]}" | grep -qw archboot_keymap ; then
|
|||
fi
|
||||
if echo "${HOOKS[@]}" | grep -qw archboot_net_common ; then
|
||||
echo -e "\e[1mNetwork Configuration:\e[m" >> "${MOTD}"
|
||||
echo -e " - Use the \e[1;92m'net'\e[m script to change your network settings." >> "${MOTD}"
|
||||
echo -e " - Use the \e[1;92m'network'\e[m script to change your network settings." >> "${MOTD}"
|
||||
fi
|
||||
if echo "${HOOKS[@]}" | grep -qw archboot_tz; then
|
||||
echo -e "\e[1mClock Configuration:\e[m" >> "${MOTD}"
|
||||
|
|
|
@ -6,7 +6,7 @@ build ()
|
|||
{
|
||||
add_all_modules -f '_cs|b44|broadcom/bnx2x|brocade|cavium|chelsio|cisco|netronome|mellanox|myricom|qlogic|qualcomm' '/drivers/net/ethernet|/net/ipv4|/net/ipv6|/drivers/net/usb'
|
||||
map add_binary ip getent ping wget
|
||||
add_file /usr/bin/archboot-net.sh /usr/bin/net
|
||||
add_file /usr/bin/archboot-network.sh /usr/bin/network
|
||||
# start dhcpcd on startup
|
||||
add_file "/usr/share/archboot/net/etc/systemd/network/10-wired-auto-dhcp.network" "/etc/systemd/network/10-wired-auto-dhcp.network"
|
||||
add_file /etc/wgetrc
|
||||
|
|
Loading…
Reference in a new issue