root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

' fixed network listing'' fixed network listing'' fixed network

Browse source 
listing'' fixed network listing'
This commit is contained in:
Tobias Powalowski 2009-01-04 16:07:50 +01:00
parent 9394182bd1
commit 9fdd2e7f93
2 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
usr/share/archboot/installer/setup
View file

@ -549,7 +549,7 @@ autoprepare() {
printk off printk off
DIALOG --infobox "Partitioning $DEVICE" 0 0 DIALOG --infobox "Partitioning $DEVICE" 0 0
# clean partitiontable to avoid issues! # clean partitiontable to avoid issues!
dd if=/dev/zero of=$DEVICE bs=512 count=1 dd if=/dev/zero of=$DEVICE bs=512 count=1 >/dev/null 2>&1
sfdisk $DEVICE -uM >$LOG 2>&1 <<EOF sfdisk $DEVICE -uM >$LOG 2>&1 <<EOF
$sfdisk_input $sfdisk_input
EOF EOF
@ -1111,7 +1111,7 @@ donetwork() {
fi fi
fi fi
while [ "$INTERFACE" = "" ]; do while [ "$INTERFACE" = "" ]; do
DIALOG --msgbox "Available Ethernet Interfaces:\n$(ifconfig -a | egrep "Ethernet" | sed 's# #_#g')\n\nIf your ethernet interface is not listed,\n1) Probe for the correct module now.\n2) Switch to another VC (ALT-F2) and load your module with\n the modprobe command, then switch back here (ALT-F1)\n" 0 0 DIALOG --msgbox "Available Ethernet Interfaces:\n$(ifconfig -a | grep "Link encap:Ethernet"| sed 's/ \+Link encap:Ethernet \+HWaddr \+/ /g')\n\nIf your ethernet interface is not listed,\n1) Probe for the correct module now.\n2) Switch to another VC (ALT-F2) and load your module with\n the modprobe command, then switch back here (ALT-F1)\n" 0 0
ifaces=$(ifconfig -a | grep "Link encap:Ethernet"| sed 's/ \+Link encap:Ethernet \+HWaddr \+/ /g') ifaces=$(ifconfig -a | grep "Link encap:Ethernet"| sed 's/ \+Link encap:Ethernet \+HWaddr \+/ /g')
DIALOG --extra-button --extra-label "Probe" --ok-label "Select" --menu "Select a network interface" 14 55 7 $ifaces 2>$ANSWER DIALOG --extra-button --extra-label "Probe" --ok-label "Select" --menu "Select a network interface" 14 55 7 $ifaces 2>$ANSWER
case $? in case $? in

12
usr/share/archboot/keymap/km
View file

@ -31,11 +31,6 @@ error_kmset()
DIALOG --msgbox "An error occured, your current keymap was not changed." 0 0 DIALOG --msgbox "An error occured, your current keymap was not changed." 0 0
} }
error_consoleset()
{
DIALOG --msgbox "An error occured, your current consolefont was not changed." 0 0
}
dokeymap() { dokeymap() {
echo "Scanning for keymaps..." echo "Scanning for keymaps..."
KEYMAPS= KEYMAPS=
@ -72,12 +67,7 @@ doconsolefont() {
setfont $BASEDIR/consolefonts/$font -C /dev/tty${i} setfont $BASEDIR/consolefonts/$font -C /dev/tty${i}
fi fi
done done
if [ $? -gt 0 ]; then [ -e /dev/ttyS0 ] && setfont $BASEDIR/consolefonts/$font -C /dev/ttyS0
error_consoleset
fi
if [ -e /dev/ttyS0 ]; then
setfont $BASEDIR/consolefonts/$font -C /dev/ttyS0 || error_consoleset
fi
fi fi
S_NEXTITEM=3 S_NEXTITEM=3
} }