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

'funciontalized some stuff'

Browse source
This commit is contained in:
Tobias Powalowski 2008-12-14 11:20:01 +01:00
parent 11bc0c5425
commit c4d1151b54
1 changed files with 36 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,8 +24,6 @@ MIRRORLIST="/etc/pacman.d/mirrorlist"
PART_ROOT=
PART_SWAP=
PATH=$PATH:/tmp/bin:/tmp/usr/bin:/tmp/sbin:/tmp/usr/sbin
# default filesystem specs (the + is bootable flag)
# <mountpoint>:<partsize>:<fstype>[:+]
DEFAULTFS="/boot:32:ext2:+ swap:256:swap /:7500:ext3 /home:*:ext3"
@ -1433,11 +1431,13 @@ prepare_harddrive()
NEXTITEM="3"
}
configure_system()
dohwdetect
{
HWDETECT=""
HWPARAMETER=""
DSDT_ENABLE=""
HWDETECTHOSTCONTROLLER=""
HWDETECTHOOKS=""
HWDETECTRC=""
DIALOG --yesno "PRECONFIGURATION?\n-----------------\n\nDo you want to use 'hwdetect' for:\n'/etc/rc.conf' and '/etc/mkinitcpio.conf'?\n\nThis ensures consistent ordering of your hard disk controllers,\nnetwork and sound devices.\n\nIt is recommended to say 'YES' here." 18 70 && HWDETECT="yes"
if [ "$HWDETECT" = "yes" ]; then
if /usr/bin/vmware-detect; then
@ -1457,6 +1457,20 @@ configure_system()
fi
DIALOG --defaultno --yesno "Do you need support for booting from lvm2 volumes?" 0 0 && HWPARAMETER="$HWPARAMETER --lvm2"
DIALOG --defaultno --yesno "Do you need support for booting from encrypted volumes?" 0 0 && HWPARAMETER="$HWPARAMETER --encrypt"
# add always keymap
HWPARAMETER="$HWPARAMETER --keymap"
HWDETECTHOSTCONTROLLER="$(hwdetect --hostcontroller $HWPARAMETER)"
HWDETECTHOOKS="$(hwdetect --hooks-dir=$DESTDIR/lib/initcpio/install --hooks $HWPARAMETER)"
HWDETECTRC="$(echo $(hwdetect --net --sound $HWPARAMETER)| sed -e 's#.*) ##g')"
[ -n "$HWDETECTHOSTCONTROLLER" ] && sed -i -e "s/^MODULES=.*/$HWDETECTHOSTCONTROLLER/g" ${DESTDIR}/etc/mkinitcpio.conf
[ -n "$HWDETECTHOOKS" ] && sed -i -e "s/^HOOKS=.*/$HWDETECTHOOKS/g" ${DESTDIR}/etc/mkinitcpio.conf
[ -n "$HWDETECTRC" ] && sed -i -e "s/^MODULES=.*/$HWDETECTRC/g" ${DESTDIR}/etc/rc.conf
fi
}
dodsdt
{
DSDT_ENABLE=""
DIALOG --defaultno --yesno "Do you need support for booting the kernel with a custom DSDT file?" 0 0 && DSDT_ENABLE=1
if [ "$DSDT_ENABLE" = "1" ]; then
while [ "$DSDT" = "" ]; do
@ -1471,18 +1485,10 @@ configure_system()
fi
done
fi
# add always keymap
HWPARAMETER="$HWPARAMETER --keymap"
HWDETECTHOSTCONTROLLER=""
HWDETECTHOOKS=""
HWDETECTRC=""
HWDETECTHOSTCONTROLLER="$(hwdetect --hostcontroller $HWPARAMETER)"
HWDETECTHOOKS="$(hwdetect --hooks-dir=$DESTDIR/lib/initcpio/install --hooks $HWPARAMETER)"
HWDETECTRC="$(echo $(hwdetect --net --sound $HWPARAMETER)| sed -e 's#.*) ##g')"
[ -n "$HWDETECTHOSTCONTROLLER" ] && sed -i -e "s/^MODULES=.*/$HWDETECTHOSTCONTROLLER/g" ${DESTDIR}/etc/mkinitcpio.conf
[ -n "$HWDETECTHOOKS" ] && sed -i -e "s/^HOOKS=.*/$HWDETECTHOOKS/g" ${DESTDIR}/etc/mkinitcpio.conf
[ -n "$HWDETECTRC" ] && sed -i -e "s/^MODULES=.*/$HWDETECTRC/g" ${DESTDIR}/etc/rc.conf
fi
}
doparameters
{
if [ -s /tmp/.keymap ]; then
DIALOG --yesno "Do you want to use the keymap: $(cat /tmp/.keymap | sed -e 's/\..*//g') in rc.conf?" 0 0 && sed -i -e "s/^KEYMAP=.*/KEYMAP=\"$(cat /tmp/.keymap | sed -e 's/\..*//g')\"/g" ${DESTDIR}/etc/rc.conf
fi
@ -1520,6 +1526,13 @@ configure_system()
chmod a+x ${DESTDIR}/etc/profile.d/proxy.sh
fi)
fi
}
configure_system()
{
dohwdetect
dodsdt
doparameters
[ "$EDITOR" ] || geteditor
DONE=0
FILE=""
@ -1585,7 +1598,7 @@ configure_system()
else
SAMEMIRROR=""
mirrorlist="${DESTDIR}/etc/pacman.d/mirrorlist"
if [ "$MODE" = "ftp" -a "${SYNC_SERVER}" != "" ]; then
if [ "$MODE" = "ftp" -a "${SYNC_URL}" != "" ]; then
DIALOG --yesno "Would you like to use the same MIRROR you used for installation?" 0 0 && SAMEMIRROR="yes"
fi
if ! [ "$SAMEMIRROR" = "yes" ]; then