mollusk/void-mklive
mollusk/void-mklive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch to iproute and dhcpcd and drop ifconfig/route/udhcpc.

Browse Source
This commit is contained in:
Juan RP 2013-05-19 10:08:12 +02:00
parent cf477a7c3f
commit c1d11098c2
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
installer.sh.in
View File

@ -452,7 +452,7 @@ configure_eth() {
} }
iface_setup() { iface_setup() {
ifconfig $1|grep -q 'inet addr:' ip addr show dev $1|grep -q 'inet '
return $? return $?
} }
@ -461,7 +461,7 @@ configure_net_dhcp() {
iface_setup $dev iface_setup $dev
if [ $? -eq 1 ]; then if [ $? -eq 1 ]; then
udhcpc -q -t 10 -n -i $dev 2>&1 | tee $LOG | \ dhcpcd -t 10 -w -4 -L $dev 2>&1 | tee $LOG | \
DIALOG --progressbox "Initializing $dev via DHCP..." ${WIDGET_SIZE} DIALOG --progressbox "Initializing $dev via DHCP..." ${WIDGET_SIZE}
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
DIALOG --msgbox "${BOLD}${RED}ERROR:${RESET} failed to run udhcpc. See $LOG for details." ${MSGBOXSIZE} DIALOG --msgbox "${BOLD}${RED}ERROR:${RESET} failed to run udhcpc. See $LOG for details." ${MSGBOXSIZE}
@ -490,13 +490,19 @@ configure_net_static() {
set -- $(cat $ANSWER) set -- $(cat $ANSWER)
ip=$1; gw=$2; dns1=$3; dns2=$4 ip=$1; gw=$2; dns1=$3; dns2=$4
echo "running: ifconfig $dev $IPADDR up" >$LOG echo "running: ip link set dev $dev up" >$LOG
ifconfig $dev $ip up >$LOG 2>&1 ip link set dev $dev up >$LOG 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
DIALOG --msgbox "${BOLD}${RED}ERROR:${RESET} Failed to setup $dev interface." ${MSGBOXSIZE} DIALOG --msgbox "${BOLD}${RED}ERROR:${RESET} Failed to bring $dev interface." ${MSGBOXSIZE}
return 1 return 1
fi fi
route add default gw $gw >$LOG 2>&1 echo "running: ip addr add $ip dev $dev"
ip addr add $ip dev $dev >$LOG 2>&1
if [ $? -ne 0 ]; then
DIALOG --msgbox "${BOLD}${RED}ERROR:${RESET} Failed to set ip to the $dev interface." ${MSGBOXSIZE}
return 1
fi
ip route add $gw dev $dev >$LOG 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
DIALOG --msgbox "${BOLD}${RED}ERROR:${RESET} failed to setup your gateway." ${MSGBOXSIZE} DIALOG --msgbox "${BOLD}${RED}ERROR:${RESET} failed to setup your gateway." ${MSGBOXSIZE}
return 1 return 1
@ -851,7 +857,7 @@ menu() {
"Partition" "Partition disk(s)" \ "Partition" "Partition disk(s)" \
"Filesystems" "Configure filesystems and mount points" \ "Filesystems" "Configure filesystems and mount points" \
"Install" "Start installation with saved settings" \ "Install" "Start installation with saved settings" \
"Exit" "Exit installation" "Exit" "Exit installation"
if [ $? -eq 3 ]; then if [ $? -eq 3 ]; then
# Show settings # Show settings