Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Changing paths to conform to archiso's defaults

  • Loading branch information...
commit 1fd3fdee59284f5e953302dbc3a69f24718dd2c4 1 parent 7096631
@svenstaro authored
Showing with 9 additions and 5 deletions.
  1. +4 −2 boot-files/syslinux/syslinux.cfg
  2. +5 −3 buildscript.sh
View
6 boot-files/syslinux/syslinux.cfg
@@ -31,8 +31,10 @@ TEXT HELP
For general info on live.linuX-gamers, please press F1
ENDTEXT
MENU LABEL Boot live.linux-gamers
-LINUX /%INSTALL_DIR%/boot/vmlinuz26
-APPEND initrd=/%INSTALL_DIR%/boot/lglive.img lang=en locale=en_US.UTF-8 archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% rw_branch_size=25%
+LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz26
+APPEND initrd=/%INSTALL_DIR%/boot/%ARCH%/lglive.img lang=en locale=en_US.UTF-8 archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% rw_branch_size=25%
+# Next line is for PXE booting, don't uncomment or remove it.
+#IPAPPEND 3
LABEL normal
MENU LABEL Normal boot
View
8 buildscript.sh
@@ -144,8 +144,10 @@ base-iso ()
{
[ ! ${QUIET} == "y" ] && echo "===== Making base-iso ====="
[ ! ${QUIET} == "y" ] && echo "base-iso: Copying boot-files"
- mv "${WORKDIR}/root-image/boot" "${WORKDIR}/iso/${INSTALL_DIR}/boot" || true
- mv "${WORKDIR}/iso/${INSTALL_DIR}/boot/memtest86+/memtest.bin" "${WORKDIR}/iso/${INSTALL_DIR}/boot/memtest"
+ mkdir -p ${WORKDIR}/iso/${INSTALL_DIR}/boot/${ARCH}
+ cp "${WORKDIR}/root-image/boot/System.map26" "${WORKDIR}/iso/${INSTALL_DIR}/boot/${ARCH}/"
+ cp "${WORKDIR}/root-image/boot/vmlinuz26" "${WORKDIR}/iso/${INSTALL_DIR}/boot/${ARCH}/"
+ cp "${WORKDIR}/root-image/boot/memtest86+/memtest.bin" "${WORKDIR}/iso/${INSTALL_DIR}/boot/memtest"
[ "$?" -ne 0 ] && echo -e "\e[01;31mbase-iso: Exiting due to error while moving boot files\e[00m" && exit 1
mkdir -p ${WORKDIR}/iso/syslinux
cp boot-files/splash.png ${WORKDIR}/iso/${INSTALL_DIR}/boot/ || return 1
@@ -165,7 +167,7 @@ base-iso ()
else
chroot ${BASEDIR}/${WORKDIR}/root-image mkinitcpio -c /etc/mkinitcpio.conf -k ${KVER} -g "/lglive.img" &>/dev/null || return 1
fi
- mv ${BASEDIR}/${WORKDIR}/root-image/lglive.img "${BASEDIR}/${WORKDIR}/iso/${INSTALL_DIR}/boot/lglive.img" &>/dev/null ||return 1
+ mv ${BASEDIR}/${WORKDIR}/root-image/lglive.img "${BASEDIR}/${WORKDIR}/iso/${INSTALL_DIR}/boot/${ARCH}/lglive.img" &>/dev/null || return 1
sed -i "s/^CacheDir/\#CacheDir/" "${BASEDIR}/${WORKDIR}/root-image/etc/pacman.conf"
sed -i "/localrepo/,+2d" "${BASEDIR}/${WORKDIR}/root-image/etc/pacman.conf"
[ "$?" -ne 0 ] && echo -e "\e[01;31mbase-iso: Exiting due to error while running mkinitcpio\e[00m" && exit 1
Please sign in to comment.
Something went wrong with that request. Please try again.