Permalink
Browse files

Adding compressor option and merging sed style changes

  • Loading branch information...
1 parent a3f051a commit fa51bc45887b0585915398734434970ad4000a08 @svenstaro committed Mar 19, 2011
Showing with 6 additions and 4 deletions.
  1. +1 −1 boot-files/syslinux/syslinux.cfg
  2. +4 −2 buildscript.sh
  3. +1 −1 mkinitcpio.conf
@@ -32,7 +32,7 @@ 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=XXX rw_branch_size=25%
+APPEND initrd=/%INSTALL_DIR%/boot/lglive.img lang=en locale=en_US.UTF-8 archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% rw_branch_size=25%
LABEL normal
MENU LABEL Normal boot
View
@@ -52,6 +52,8 @@ VERBOSE="n"
QUIET="n"
# Absolute path to makepkg.conf.
MAKEPKGCNF=`readlink -f makepkg.conf`
+# Compress the squashfs with this compressor.
+COMPRESS="gzip"
# usage: usage <exitvalue>
usage ()
@@ -250,9 +252,9 @@ build ()
[ ! ${QUIET} == "y" ] && echo "build: Saving to ${FULLNAME}-${edition}.${imagetype}"
[ ! ${QUIET} == "y" ] && echo "build: Starting build, this will take some time"
if [ ${VERBOSE} == "y" ]; then
- mkarchiso -D ${INSTALL_DIR} -f -v -L "${NAME}-${VER//./}" -P "Linux-Gamers <live.linux-gamers.net>" -A "live.linux-gamers" -p "${BOOTLOADER}" "${imagetype}" "${WORKDIR}" "${FULLNAME}-${edition}.${imagetype}"
+ mkarchiso -D ${INSTALL_DIR} -c ${COMPRESS} -f -v -L "${NAME}-${VER//./}" -P "Linux-Gamers <live.linux-gamers.net>" -A "live.linux-gamers" -p "${BOOTLOADER}" "${imagetype}" "${WORKDIR}" "${FULLNAME}-${edition}.${imagetype}"
else
- mkarchiso -D ${INSTALL_DIR} -f -v -L "${NAME}-${VER//./}" -P "Linux-Gamers <live.linux-gamers.net>" -A "live.linux-gamers" -p "${BOOTLOADER}" "${imagetype}" "${WORKDIR}" "${FULLNAME}-${edition}.${imagetype}" &> /dev/null
+ mkarchiso -D ${INSTALL_DIR} -c ${COMPRESS} -f -v -L "${NAME}-${VER//./}" -P "Linux-Gamers <live.linux-gamers.net>" -A "live.linux-gamers" -p "${BOOTLOADER}" "${imagetype}" "${WORKDIR}" "${FULLNAME}-${edition}.${imagetype}" &> /dev/null
fi
[ "$?" -ne 0 ] && echo -e "\e[01;31mbuild: Exiting due to error while running mkarchiso\e[00m" && exit 1
[ ! ${QUIET} == "y" ] && echo "===== Finished building final image for target: ${TARGET} ====="
View
@@ -2,5 +2,5 @@
MODULES=""
BINARIES=""
FILES=""
-HOOKS="base udev memdisk archiso archiso_pxe_nbd pata scsi sata usb fw pcmcia filesystems usbinput"
+HOOKS="base udev memdisk archiso archiso_pxe_nbd archiso_loop_mnt pata scsi sata usb fw pcmcia filesystems usbinput"
COMPRESSION="lzma"

0 comments on commit fa51bc4

Please sign in to comment.