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

'changed syslinux invocation'

Browse source
This commit is contained in:
Tobias Powalowski 2009-04-26 18:31:30 +02:00
parent 50dd91718f
commit 1de9c3dffc
5 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/initcpio/install/arch_core_install
View file

@ -44,7 +44,7 @@ install ()
DEVEL="$DEVEL $(echo $i)" DEVEL="$DEVEL $(echo $i)"
done done
SUPPORT="" SUPPORT=""
SUPPORT="$(echo -n $(pacman -Ss | grep -e ^core | grep -v '(' | sed -e 's/\ .*/ /g' -e 's#core/##g')) ntfs-3g syslinux dhclient" SUPPORT="$(echo -n $(pacman -Ss | grep -e ^core | grep -v '(' | sed -e 's/\ .*/ /g' -e 's#core/##g')) ntfs-3g dhclient"
for i in base devel lib support; do for i in base devel lib support; do
mkdir $i mkdir $i
svn co -N ${SVNSETUP} $i svn co -N ${SVNSETUP} $i

2
lib/initcpio/install/arch_pacman
View file

@ -20,7 +20,7 @@ pcre cpio archboot fuse klibc libusb vi lzo2 libsasl libldap libevent gpm sdparm
rt2x00-rt61-fw rt2x00-rt71w-fw rt2500 ndiswrapper ndiswrapper-utils \ rt2x00-rt61-fw rt2x00-rt71w-fw rt2500 ndiswrapper ndiswrapper-utils \
zd1211-firmware ipw2100-fw ipw2200-fw iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-5000-ucode \ zd1211-firmware ipw2100-fw ipw2200-fw iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-5000-ucode \
smbclient tdb tiacx tiacx-firmware dmraid linux-atm netcfg tiacx tiacx-firmware parted tzdata ntp \ smbclient tdb tiacx tiacx-firmware dmraid linux-atm netcfg tiacx tiacx-firmware parted tzdata ntp \
v86d wlan-ng26-utils iw crda wireless-regdb libnl iproute2 dhclient syslinux" v86d wlan-ng26-utils iw crda wireless-regdb libnl iproute2 dhclient syslinux mtools"
for i in $DEPENDS; do for i in $DEPENDS; do
for k in $(echo /var/lib/pacman/local/$i-[0-9]*-[0-9]*); do for k in $(echo /var/lib/pacman/local/$i-[0-9]*-[0-9]*); do

2
lib/initcpio/install/arch_syslinux
View file

@ -3,7 +3,7 @@
install () install ()
{ {
MODULES="" MODULES=""
BINARIES="syslinux" BINARIES="syslinux mcopy"
FILES="" FILES=""
SCRIPT="" SCRIPT=""
add_file "/usr/lib/syslinux/mbr.bin" add_file "/usr/lib/syslinux/mbr.bin"

2
usr/bin/archboot-svn.sh
View file

@ -13,7 +13,7 @@ for i in $(pacman -Sg base-devel | sed -e "s/base-devel//g"); do
DEVEL="$DEVEL $(echo $i)" DEVEL="$DEVEL $(echo $i)"
done done
# generate support, ntfs-3g is added additionally! # generate support, ntfs-3g is added additionally!
SUPPORT="$(echo -n $(pacman -Ss | grep -e ^core | grep -v '(' | sed -e 's/\ .*/ /g' -e 's#core/##g')) ntfs-3g syslinux dhclient" SUPPORT="$(echo -n $(pacman -Ss | grep -e ^core | grep -v '(' | sed -e 's/\ .*/ /g' -e 's#core/##g')) ntfs-3g dhclient"
for i in base devel support; do for i in base devel support; do
mkdir $i mkdir $i
svn co -N ${SVNSETUP} $i svn co -N ${SVNSETUP} $i

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

@ -2080,7 +2080,7 @@ dosyslinux() {
getrootfs getrootfs
getraidarrays getraidarrays
getcryptsetup getcryptsetup
if [ ! -e $DESTDIR/usr/bin/syslinux ]; then if [ ! -e /usr/bin/syslinux ]; then
DIALOG --msgbox "Error: Couldn't find syslinux binary. Is SYSLINUX installed?" 0 0 DIALOG --msgbox "Error: Couldn't find syslinux binary. Is SYSLINUX installed?" 0 0
return 1 return 1
fi fi
@ -2105,7 +2105,7 @@ dosyslinux() {
ROOTDEV=$(cat $ANSWER) ROOTDEV=$(cat $ANSWER)
# generate syslinux.cfg # generate syslinux.cfg
TEMPDIR=/tmp TEMPDIR=/tmp
MBR=${DESTDIR}/usr/lib/syslinux/mbr.bin MBR=/usr/lib/syslinux/mbr.bin
[ -e ${TEMPDIR}/syslinux.cfg ] && rm ${TEMPDIR}/syslinux.cfg [ -e ${TEMPDIR}/syslinux.cfg ] && rm ${TEMPDIR}/syslinux.cfg
echo "prompt 1" >> ${TEMPDIR}/syslinux.cfg echo "prompt 1" >> ${TEMPDIR}/syslinux.cfg
echo "timeout 300" >> ${TEMPDIR}/syslinux.cfg echo "timeout 300" >> ${TEMPDIR}/syslinux.cfg
@ -2128,14 +2128,11 @@ dosyslinux() {
DIALOG --infobox "Installing the SYSLINUX bootloader..." 0 0 DIALOG --infobox "Installing the SYSLINUX bootloader..." 0 0
cp ${TEMPDIR}/syslinux.cfg ${DESTDIR}/boot/syslinux.cfg cp ${TEMPDIR}/syslinux.cfg ${DESTDIR}/boot/syslinux.cfg
cat ${MBR} > ${ROOTDEV} cat ${MBR} > ${ROOTDEV}
chroot_mount syslinux -o offset $bootdev >$LOG 2>&1
chroot $DESTDIR /usr/bin/syslinux -o offset $bootdev >$LOG 2>&1
if [ $? -gt 0 ]; then if [ $? -gt 0 ]; then
chroot_umount
DIALOG --msgbox "Error installing SYSLINUX. (see $LOG for output)" 0 0 DIALOG --msgbox "Error installing SYSLINUX. (see $LOG for output)" 0 0
return 1 return 1
fi fi
chroot_umount
DIALOG --msgbox "SYSLINUX was successfully installed." 0 0 DIALOG --msgbox "SYSLINUX was successfully installed." 0 0
} }
@ -2941,7 +2938,7 @@ install_bootloader()
{ {
CANCEL="" CANCEL=""
DIALOG --menu "Which bootloader would you like to use? Grub is the Arch default.\n\n" \ DIALOG --menu "Which bootloader would you like to use? Grub is the Arch default.\n\n" \
10 55 2 \ 12 55 3 \
"GRUB" "Use the GRUB bootloader (default)" \ "GRUB" "Use the GRUB bootloader (default)" \
"LILO" "Use the LILO bootloader" \ "LILO" "Use the LILO bootloader" \
"SYSLINUX" "Use the SYSLINUX bootloader" 2>$ANSWER || CANCEL=1 "SYSLINUX" "Use the SYSLINUX bootloader" 2>$ANSWER || CANCEL=1