diff --git a/usr/lib/archboot/login.sh b/usr/lib/archboot/login.sh index 22d43ca47..29713db62 100644 --- a/usr/lib/archboot/login.sh +++ b/usr/lib/archboot/login.sh @@ -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 diff --git a/usr/lib/archboot/update/update.sh b/usr/lib/archboot/update/update.sh index 58eab4c73..1a0a38555 100644 --- a/usr/lib/archboot/update/update.sh +++ b/usr/lib/archboot/update/update.sh @@ -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 diff --git a/usr/lib/initcpio/install/archboot_motd b/usr/lib/initcpio/install/archboot_motd index d5dd38337..86d3cec60 100644 --- a/usr/lib/initcpio/install/archboot_motd +++ b/usr/lib/initcpio/install/archboot_motd @@ -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}" diff --git a/usr/lib/initcpio/install/archboot_net_common b/usr/lib/initcpio/install/archboot_net_common index 98938beb6..81a4699bd 100644 --- a/usr/lib/initcpio/install/archboot_net_common +++ b/usr/lib/initcpio/install/archboot_net_common @@ -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