diff options
author | Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> | 2011-06-18 18:38:58 -0300 |
---|---|---|
committer | Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> | 2011-06-18 18:38:27 -0300 |
commit | 85d243ff5836fc17416c65dca8a9e8b4e9d915bc (patch) | |
tree | 78b3ec86fea064580c43966da866d46e31ab7007 /archiso2dual | |
parent | 4a1bd4c7697bdc7aa89eca04009d868e4dd39cb4 (diff) |
[archiso] Use dm-snapshot instead of aufs2 (A.K.A. "The Big Commit")
* Use device mapper + snapshot module, instead union layer filesystem.
* A block-level approach vs vfs-level.
* No more unofficial (Linux) things.
* More memory is needed.
* Refactor mkarchiso.
* Refactor hooks/archiso.
* Fix install/archiso_pxe_nbd
(due recent change in mkinitcpio-0.6.15 on checked_modules()/all_modules())
[Thanks Dave for the improved workaround]
* New configs/releng to build official images.
* Works with a Bash script instead of Makefile.
(better control and easy to maintain)
* Remove configs/syslinux-iso.
* Remove archiso2dual script. Integrate functionality in configs/releng.
* New configs/baseline to build the most basic live medium or use as template.
* New README (draft). [Thanks Dieter for fixing english grammar]
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Diffstat (limited to 'archiso2dual')
-rw-r--r-- | archiso2dual/Makefile | 13 | ||||
-rw-r--r-- | archiso2dual/README | 55 | ||||
-rwxr-xr-x | archiso2dual/archiso2dual | 411 | ||||
-rw-r--r-- | archiso2dual/isomounts | 12 | ||||
-rw-r--r-- | archiso2dual/removefiles.lst | 7 | ||||
-rw-r--r-- | archiso2dual/syslinux.cfg | 12 | ||||
-rw-r--r-- | archiso2dual/syslinux_32only.cfg | 3 | ||||
-rw-r--r-- | archiso2dual/syslinux_arch32.cfg | 10 | ||||
-rw-r--r-- | archiso2dual/syslinux_arch64.cfg | 10 | ||||
-rw-r--r-- | archiso2dual/syslinux_both.cfg | 4 | ||||
-rw-r--r-- | archiso2dual/syslinux_head.cfg | 32 | ||||
-rw-r--r-- | archiso2dual/syslinux_tail.cfg | 29 |
12 files changed, 0 insertions, 598 deletions
diff --git a/archiso2dual/Makefile b/archiso2dual/Makefile deleted file mode 100644 index f615bce..0000000 --- a/archiso2dual/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -all: - -install: all - install -D -m 755 archiso2dual $(DESTDIR)/usr/sbin/archiso2dual - install -d -m 755 $(DESTDIR)/usr/share/archiso2dual/syslinux - install -D -m 644 isomounts $(DESTDIR)/usr/share/archiso2dual/isomounts - install -D -m 644 syslinux.cfg $(DESTDIR)/usr/share/archiso2dual/syslinux/syslinux.cfg - install -D -m 644 *.cfg $(DESTDIR)/usr/share/archiso2dual/syslinux/ - install -D -m 644 removefiles.lst $(DESTDIR)/usr/share/archiso2dual/removefiles.lst - -uninstall: - rm -f $(DESTDIR)/usr/sbin/archiso2dual - rm -rf $(DESTDIR)/usr/share/archiso2dual diff --git a/archiso2dual/README b/archiso2dual/README deleted file mode 100644 index 5e18aed..0000000 --- a/archiso2dual/README +++ /dev/null @@ -1,55 +0,0 @@ -Tree structure of an iso image archlinux-2010.04.24-core-dual.iso (610MB) -running with profile "split": - -# tree -I *.c32 -. -|-- any -| `-- usrshare.sqfs -|-- boot -| |-- i686 -| | |-- archiso.img -| | `-- vmlinuz26 -| |-- syslinux -| | |-- boot.cat -| | |-- isolinux.bin -| | |-- syslinux.cfg -| | `-- memdisk -| |-- memtest -| |-- memtest.COPYING -| |-- releasenotes.txt -| |-- splash.png -| |-- x86_64 -| | |-- archiso.img -| | `-- vmlinuz26 -|-- i686 -| |-- core-pkgs.sqfs -| |-- libmodules.sqfs -| |-- overlay.sqfs -| `-- root-image.sqfs -|-- isomounts.i686 -|-- isomounts.x86_64 -|-- isomounts.x86_64-i686 -`-- x86_64 - |-- core-pkgs.sqfs - |-- libmodules.sqfs - |-- overlay.sqfs - `-- root-image.sqfs - -7 directories, 26 files - -* Current dual image sizes (basic/split/full) - -664M archlinux-2010.04.24-core-dual.iso -610M archlinux-2010.04.24-core-dual.iso -572M archlinux-2010.04.24-core-dual.iso - -326M archlinux-2010.04.24-netinstall-dual.iso -272M archlinux-2010.04.24-netinstall-dual.iso -234M archlinux-2010.04.24-netinstall-dual.iso - -* Current single image sizes: -326M archlinux-2010.04.24-core-i686.iso -342M archlinux-2010.04.24-core-x86_64.iso - -161M archlinux-2010.04.24-netinstall-i686.iso -169M archlinux-2010.04.24-netinstall-x86_64.iso diff --git a/archiso2dual/archiso2dual b/archiso2dual/archiso2dual deleted file mode 100755 index 4e80b4d..0000000 --- a/archiso2dual/archiso2dual +++ /dev/null @@ -1,411 +0,0 @@ -#!/bin/bash - -# -# Join two Arch Linux iso images of i686 and x86_64 architecture. -# Contributed for archiso by Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> -# - -set -e -u - -publisher="Arch Linux <http://www.archlinux.org>" -application="Arch Linux Live/Rescue disk" -label="ARCH_$(date +%Y%m)" -isofile_i686="" -isofile_x86_64="" -imgname="" -quiet="y" -profile_type="basic" -work_dir="/tmp/archiso2dual" -isomounts_file="/usr/share/archiso2dual/isomounts" -syslinuxcfg_dir="/usr/share/archiso2dual/syslinux" -removefiles_file="/usr/share/archiso2dual/removefiles.lst" -compression="xz" -install_dir="arch" -appname=${0##*/} -_error="0" -_confirm="n" -_v="" -_iscoreiso=n - -iso_umount() { - echo "Executing: ${FUNCNAME}" - trap - 0 1 2 15 - umount ${_v} ${work_dir}/i686/mnt - umount ${_v} ${work_dir}/x86_64/mnt -} - -iso_mount() { - echo "Executing: ${FUNCNAME}" - trap 'iso_umount' 0 1 2 15 - mount ${_v} -t udf -o ro,loop ${isofile_i686} ${work_dir}/i686/mnt - mount ${_v} -t udf -o ro,loop ${isofile_x86_64} ${work_dir}/x86_64/mnt -} - -kernel_copy() { - echo "Executing: ${FUNCNAME}" - for _arch in i686 x86_64; do - cp ${_v} ${work_dir}/${_arch}/mnt/${install_dir}/boot/${_arch}/archiso.img ${work_dir}/iso/${install_dir}/boot/${_arch}/archiso.img - cp ${_v} ${work_dir}/${_arch}/mnt/${install_dir}/boot/${_arch}/vmlinuz26 ${work_dir}/iso/${install_dir}/boot/${_arch}/vmlinuz26 - done -} - -syslinux_copy() { - echo "Executing: ${FUNCNAME}" - cp ${_v} ${work_dir}/i686/mnt/${install_dir}/boot/{memtest*,splash.png} ${work_dir}/iso/${install_dir}/boot/ - cp ${_v} ${work_dir}/i686/mnt/syslinux/*.c32 ${work_dir}/iso/syslinux/ - cp ${_v} ${work_dir}/i686/mnt/syslinux/poweroff.com ${work_dir}/iso/syslinux/ - cp ${_v} ${work_dir}/i686/mnt/syslinux/memdisk ${work_dir}/iso/syslinux/ - cp ${_v} ${work_dir}/i686/mnt/syslinux/isolinux.bin ${work_dir}/iso/syslinux/ - cp ${_v} ${work_dir}/i686/mnt/syslinux/pxelinux.0 ${work_dir}/iso/syslinux/ - cp ${_v} ${work_dir}/i686/mnt/syslinux/gpxelinux.0 ${work_dir}/iso/syslinux/ - cp ${_v} -r ${work_dir}/i686/mnt/syslinux/hdt ${work_dir}/iso/syslinux/ -} - -syslinuxcfg_copy() { - echo "Executing: ${FUNCNAME}" - for _cfg in ${syslinuxcfg_dir}/*.cfg; do - sed "s|%ARCHISO_LABEL%|${label}|g; - s|%INSTALL_DIR%|${install_dir}|g" ${_cfg} > ${work_dir}/iso/syslinux/$(basename ${_cfg}) - done -} - -isomounts_copy() { - echo "Executing: ${FUNCNAME}" - cp ${_v} ${isomounts_file} ${work_dir}/iso/${install_dir}/ -} - -squashfs_copy() { - echo "Executing: ${FUNCNAME}" - for _arch in i686 x86_64; do - cp ${_v} ${work_dir}/${_arch}/mnt/${install_dir}/${_arch}/*.sqfs ${work_dir}/iso/${install_dir}/${_arch}/ - done -} - -make_iso() { - echo "Executing: ${FUNCNAME}" - if [ "${quiet}" = "y" ]; then - _qflag="-quiet" - else - _qflag="" - fi - mkisofs ${_v} ${_qflag} -r -l \ - -b syslinux/isolinux.bin -c syslinux/boot.cat \ - -uid 0 -gid 0 \ - -udf -allow-limited-size -iso-level 3 \ - -input-charset utf-8 -p "prepared by archiso2dual" \ - -no-emul-boot -boot-load-size 4 -boot-info-table \ - -publisher "${publisher}" \ - -A "${application}" \ - -V "${label}" \ - -o "${imgname}" "${work_dir}/iso/" - isohybrid "${imgname}" -} - -unsquashfs_image() { - echo "Executing: ${FUNCNAME}" - img=${1} - arch=${2} - rm -rf ${work_dir}/tmp/${arch}/${img} - if [ "${quiet}" = "y" ]; then - unsquashfs -d ${work_dir}/tmp/${arch}/${img} ${work_dir}/iso/${install_dir}/${arch}/${img}.sqfs > /dev/null - else - unsquashfs -d ${work_dir}/tmp/${arch}/${img} ${work_dir}/iso/${install_dir}/${arch}/${img}.sqfs - fi -} - -mksquashfs_image() { - echo "Executing: ${FUNCNAME}" - img=${1} - arch=${2} - rm -f ${work_dir}/iso/${install_dir}/${arch}/${img}.sqfs - if [ "${quiet}" = "y" ]; then - mksquashfs ${work_dir}/tmp/${arch}/${img} ${work_dir}/iso/${install_dir}/${arch}/${img}.sqfs -comp ${compression} > /dev/null - else - mksquashfs ${work_dir}/tmp/${arch}/${img} ${work_dir}/iso/${install_dir}/${arch}/${img}.sqfs -comp ${compression} - fi -} - -usrshare_make_image() { - echo "Executing: ${FUNCNAME}" - mkdir -p ${work_dir}/tmp/any/usrshare/usr - cp -a ${work_dir}/tmp/i686/root-image/usr/share ${work_dir}/tmp/any/usrshare/usr - mksquashfs_image usrshare any -} - -libmodules_make_image() { - echo "Executing: ${FUNCNAME}" - for _arch in i686 x86_64; do - mkdir -p ${work_dir}/tmp/${_arch}/libmodules/lib - cp -a ${work_dir}/tmp/${_arch}/root-image/lib/modules ${work_dir}/tmp/${_arch}/libmodules/lib - mksquashfs_image libmodules ${_arch} - done -} - -core_pkgs_make_image() { - echo "Executing: ${FUNCNAME}" - mkdir -p ${work_dir}/tmp/any/core-any-pkgs/src/core/pkg - cp -a ${work_dir}/tmp/i686/core-pkgs/src/core/pkg/*-any.pkg.* ${work_dir}/tmp/any/core-any-pkgs/src/core/pkg - for _arch in i686 x86_64; do - rm -rf ${work_dir}/tmp/${_arch}/core-pkgs/src/core/pkg/*-any.pkg.* - mksquashfs_image core-pkgs ${_arch} - done - mksquashfs_image core-any-pkgs any -} - -core_pkgs_extract() { - echo "Executing: ${FUNCNAME}" - for _arch in i686 x86_64; do - unsquashfs_image core-pkgs ${_arch} - done -} - -check_if_core_medium() { - echo "Executing: ${FUNCNAME}" - if [ -f ${work_dir}/iso/${install_dir}/i686/core-pkgs.sqfs ] && [ -f ${work_dir}/iso/${install_dir}/x86_64/core-pkgs.sqfs ]; then - _iscoreiso=y - fi -} - -root_image_extract() { - echo "Executing: ${FUNCNAME}" - for _arch in i686 x86_64; do - unsquashfs_image root-image ${_arch} - done -} - -root_image_purge() { - echo "Executing: ${FUNCNAME}" - while read _file; do - [ "${_file#"#"}" != "${_file}" ] && continue - for _arch in i686 x86_64; do - rm -rf "${work_dir}/tmp/${_arch}/root-image/${_file}" - done - done < "${removefiles_file}" -} - -root_image_list_purge() { - while read _file; do - [ "${_file#"#"}" != "${_file}" ] && continue - for _arch in i686 x86_64; do - echo "${work_dir}/tmp/${_arch}/root-image/${_file}" - done - done < "${removefiles_file}" -} - -root_image_make_image() { - echo "Executing: ${FUNCNAME}" - for _arch in i686 x86_64; do - rm -rf ${work_dir}/tmp/${_arch}/root-image/usr/share - rm -rf ${work_dir}/tmp/${_arch}/root-image/lib/modules - mksquashfs_image root-image ${_arch} - done -} - -make_workspace() { - echo "Executing: ${FUNCNAME}" - for _arch in i686 x86_64; do - mkdir ${_v} -p ${work_dir}/iso/${install_dir}/${_arch} - mkdir ${_v} -p ${work_dir}/iso/${install_dir}/boot/${_arch} - mkdir ${_v} -p ${work_dir}/${_arch}/mnt - mkdir ${_v} -p ${work_dir}/tmp/${_arch} - done - mkdir ${_v} -p ${work_dir}/iso/syslinux - mkdir ${_v} -p ${work_dir}/iso/${install_dir}/any - mkdir ${_v} -p ${work_dir}/tmp/any -} - -show_help() -{ - exitvalue=${1} - echo - echo "${appname} [options] -3 <i686.iso> -6 <x86_64.iso> -o <output.iso>" - echo - echo " needed options:" - echo " -3 <i686.iso> Path to i686 source iso image" - echo " -6 <x86_64.iso> Path to x86_64 source iso image" - echo " -o <output.iso> Path to dual target iso image" - echo - echo " general options:" - echo " -M <isomounts> Path to isomounts file - (default to '${isomounts_file}'" - echo " -S <syslinux> Path to syslinux.cfg file - (default to '${syslinuxcfg_dir}'" - echo " -R <removefiles> Path to removefiles file - (default to '${removefiles_file}'" - echo " -w <workdir> Set work directory - (default to '${work_dir}')" - echo " -T <profile> Type of target image (work is done on root-image.sqfs): - basic: join both images, no changes in root-image - split: 'basic' + split out usr/share/ and lib/modules/ from root-image - full: 'split' + remove specified directories (with -R) from root-image - (default to '${profile_type}')" - echo " -L <label> Set a label for the disk [max 11 chars] - (default to '${label}')" - echo " -P <publisher> Set a publisher for the disk - (default to '${publisher}')" - echo " -A <application> Set an application name for the disk - (default to '${application}')" - echo " -c <compressor> Set SquashFS compression type: gzip, xz or lzo. - (default to '${compression}')" - echo " -D <install_dir> Set an install_dir - (default to '${install_dir}')" - echo " NOTES:" - echo " Must match install_dir from both .iso sources" - echo " Max 8 characters, use only [a-z0-9]" - echo " -y Confirm execution (otherwise only show configuration)" - echo " -v Enable verbose output" - echo " -h This message" - exit ${exitvalue} -} - -show_config() { - echo - echo "${appname} : Configuration settings" - echo " source iso i686 image: ${isofile_i686}" - echo " source iso x86_64 image: ${isofile_x86_64}" - echo " target iso image: ${imgname}" - echo " install directory on ISO: ${install_dir}" - echo " isomounts file: ${isomounts_file}" - echo " syslinux.cfg path: ${syslinuxcfg_dir}" - echo " removefiles.lst file: ${removefiles_file}" - echo " working directory: ${work_dir}" - echo " profile: ${profile_type}" - echo " label: ${label}" - echo " publisher: ${publisher}" - echo " application: ${application}" - echo " compression: ${compression}" - echo - if [ "${profile_type}" = "full" ]; then - echo "These files will be deleted (selected via -R option)" - root_image_list_purge - fi -} - -options_check() { - if [ "x${isofile_i686}" = "x" ]; then - echo "*ERROR*: -3 <i686.iso> must be specified" - _error="1" - fi - - if [ "x${isofile_x86_64}" = "x" ]; then - echo "*ERROR*: -6 <x86_64.iso> must be specified" - _error="1" - fi - - if [ "x${imgname}" = "x" ]; then - echo "*ERROR*: -o <output.iso> must be specified" - _error="1" - fi - - if [ ${_error} = "1" ]; then - show_help 1 - fi -} - -sanity_check() { - echo - if [ ! -f "${isofile_i686}" ]; then - echo "*ERROR*: ${isofile_i686} does not exist" - _error="1" - fi - - if [ ! -f "${isofile_x86_64}" ]; then - echo "*ERROR*: ${isofile_x86_64} does not exist" - _error="1" - fi - - if [ -f "${imgname}" ]; then - echo "*ERROR*: ${imgname} already exists, aborting" - _error="1" - fi - - if [ ! -f "${isomounts_file}" ]; then - echo "*ERROR*: ${isomounts_file} does not exist, , specify one with -M option" - _error="1" - fi - - if [ ! -f "${syslinuxcfg_dir}/syslinux.cfg" ]; then - echo "*ERROR*: ${syslinuxcfg_dir}/syslinux.cfg does not exist, specify one with -S option" - _error="1" - fi - - if [ ! -f "${removefiles_file}" ]; then - echo "*ERROR*: ${removefiles_file} does not exist, specify one with -R option" - _error="1" - fi - - if [ -d "${work_dir}" ]; then - echo "*ERROR*: work directory ${work_dir} is present, first delete it" - _error="1" - fi - - if [ ${_error} = "1" ]; then - exit 1 - fi -} - -if [ "$EUID" != "0" ]; then - echo "*ERROR*: This script must be run as root." - exit 1 -fi - -while getopts '3:6:o:T:M:S:R:L:P:A:c:D:yvh' arg; do - case "${arg}" in - 3) isofile_i686="${OPTARG}" ;; - 6) isofile_x86_64="${OPTARG}" ;; - o) imgname="${OPTARG}" ;; - T) case "${OPTARG}" in - "basic"|"split"|"full") profile_type="${OPTARG}" ;; - *) echo; echo "*ERROR*: invalid argument in -T option: ${profile_type}"; show_help 1 ;; - esac - ;; - M) isomounts_file="${OPTARG}" ;; - S) syslinuxcfg_dir="${OPTARG}" ;; - R) removefiles_file="${OPTARG}" ;; - L) label="${OPTARG}" ;; - P) publisher="${OPTARG}" ;; - A) application="${OPTARG}" ;; - c) compression="${OPTARG}" ;; - D) install_dir="${OPTARG}" ;; - w) work_dir="${OPTARG}" ;; - y) _confirm="y" ;; - v) quiet="n"; _v="-v" ;; - h|?) show_help 0 ;; - *) echo; echo "*ERROR*: invalid argument '${arg}'"; show_help 1 ;; - esac -done - -options_check -sanity_check -show_config - -if [ "${_confirm}" != "y" ]; then - echo - echo "If configuration is correct, re-execute with -y" - exit 1 -fi -make_workspace -iso_mount -kernel_copy -syslinux_copy -squashfs_copy -check_if_core_medium -iso_umount -syslinuxcfg_copy -isomounts_copy -if [ ${profile_type} = "full" ] || [ ${profile_type} = "split" ]; then - root_image_extract - if [ ${profile_type} = "full" ]; then - root_image_purge - fi - if [ ${_iscoreiso} = "y" ]; then - core_pkgs_extract - fi - usrshare_make_image - libmodules_make_image - root_image_make_image - if [ ${_iscoreiso} = "y" ]; then - core_pkgs_make_image - fi -fi -make_iso diff --git a/archiso2dual/isomounts b/archiso2dual/isomounts deleted file mode 100644 index ead8067..0000000 --- a/archiso2dual/isomounts +++ /dev/null @@ -1,12 +0,0 @@ -i686/overlay.sqfs i686 / squashfs -x86_64/overlay.sqfs x86_64 / squashfs -any/core-any-pkgs.sqfs i686 / squashfs -any/core-any-pkgs.sqfs x86_64 / squashfs -i686/core-pkgs.sqfs i686 / squashfs -x86_64/core-pkgs.sqfs x86_64 / squashfs -any/usrshare.sqfs i686 / squashfs -any/usrshare.sqfs x86_64 / squashfs -i686/libmodules.sqfs i686 / squashfs -x86_64/libmodules.sqfs x86_64 / squashfs -i686/root-image.sqfs i686 / squashfs -x86_64/root-image.sqfs x86_64 / squashfs diff --git a/archiso2dual/removefiles.lst b/archiso2dual/removefiles.lst deleted file mode 100644 index 516ff02..0000000 --- a/archiso2dual/removefiles.lst +++ /dev/null @@ -1,7 +0,0 @@ -# files/directories to remove from root-image.sqfs -boot -usr/include -usr/share/doc -usr/share/info -usr/share/man -usr/src diff --git a/archiso2dual/syslinux.cfg b/archiso2dual/syslinux.cfg deleted file mode 100644 index ac92998..0000000 --- a/archiso2dual/syslinux.cfg +++ /dev/null @@ -1,12 +0,0 @@ -DEFAULT choose -PROMPT 0 - -LABEL choose -KERNEL ifcpu64.c32 -APPEND have64 -- nohave64 - -LABEL have64 -CONFIG syslinux_both.cfg - -LABEL nohave64 -CONFIG syslinux_32only.cfg diff --git a/archiso2dual/syslinux_32only.cfg b/archiso2dual/syslinux_32only.cfg deleted file mode 100644 index c7a452d..0000000 --- a/archiso2dual/syslinux_32only.cfg +++ /dev/null @@ -1,3 +0,0 @@ -INCLUDE syslinux_head.cfg -INCLUDE syslinux_arch32.cfg -INCLUDE syslinux_tail.cfg diff --git a/archiso2dual/syslinux_arch32.cfg b/archiso2dual/syslinux_arch32.cfg deleted file mode 100644 index f912874..0000000 --- a/archiso2dual/syslinux_arch32.cfg +++ /dev/null @@ -1,10 +0,0 @@ -LABEL arch32 -TEXT HELP -Boot the Arch Linux (i686) live medium. It allows you to install Arch Linux or -perform system maintenance. -ENDTEXT -MENU LABEL Boot Arch Linux (i686) -LINUX /%INSTALL_DIR%/boot/i686/vmlinuz26 -APPEND initrd=/%INSTALL_DIR%/boot/i686/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% rw_branch_size=75% locale=en_US.UTF-8 -# Next line should be uncommented when prepare enviroment to boot from PXE. -#IPAPPEND 3 diff --git a/archiso2dual/syslinux_arch64.cfg b/archiso2dual/syslinux_arch64.cfg deleted file mode 100644 index 10786cd..0000000 --- a/archiso2dual/syslinux_arch64.cfg +++ /dev/null @@ -1,10 +0,0 @@ -LABEL arch64 -TEXT HELP -Boot the Arch Linux (x86_64) live medium. It allows you to install Arch Linux or -perform system maintenance. -ENDTEXT -MENU LABEL Boot Arch Linux (x86_64) -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz26 -APPEND initrd=/%INSTALL_DIR%/boot/x86_64/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% rw_branch_size=75% locale=en_US.UTF-8 -# Next line should be uncommented when prepare enviroment to boot from PXE. -#IPAPPEND 3 diff --git a/archiso2dual/syslinux_both.cfg b/archiso2dual/syslinux_both.cfg deleted file mode 100644 index 9cd1584..0000000 --- a/archiso2dual/syslinux_both.cfg +++ /dev/null @@ -1,4 +0,0 @@ -INCLUDE syslinux_head.cfg -INCLUDE syslinux_arch32.cfg -INCLUDE syslinux_arch64.cfg -INCLUDE syslinux_tail.cfg diff --git a/archiso2dual/syslinux_head.cfg b/archiso2dual/syslinux_head.cfg deleted file mode 100644 index ff955e4..0000000 --- a/archiso2dual/syslinux_head.cfg +++ /dev/null @@ -1,32 +0,0 @@ -DEFAULT vesamenu.c32 -PROMPT 0 -MENU TITLE Arch Linux -MENU BACKGROUND /%INSTALL_DIR%/boot/splash.png -TIMEOUT 3000 - -# TODO: Replace these crappy messages with something useful -F1 boot.txt -F2 options.txt -F3 help.txt - -MENU WIDTH 78 -MENU MARGIN 4 -MENU ROWS 7 -MENU VSHIFT 10 -MENU TIMEOUTROW 13 -MENU TABMSGROW 11 -MENU CMDLINEROW 11 -MENU HELPMSGROW 16 -MENU HELPMSGENDROW 29 - -# Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu - -MENU COLOR border 30;44 #40ffffff #a0000000 std -MENU COLOR title 1;36;44 #9033ccff #a0000000 std -MENU COLOR sel 7;37;40 #e0ffffff #20ffffff all -MENU COLOR unsel 37;44 #50ffffff #a0000000 std -MENU COLOR help 37;40 #c0ffffff #a0000000 std -MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std -MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std -MENU COLOR msg07 37;40 #90ffffff #a0000000 std -MENU COLOR tabmsg 31;40 #30ffffff #00000000 std diff --git a/archiso2dual/syslinux_tail.cfg b/archiso2dual/syslinux_tail.cfg deleted file mode 100644 index 7dd1270..0000000 --- a/archiso2dual/syslinux_tail.cfg +++ /dev/null @@ -1,29 +0,0 @@ -LABEL existing -TEXT HELP -Boot an existing operating system. Press TAB to edit the disk and partition -number to boot. -ENDTEXT -MENU LABEL Boot existing OS -COM32 chain.c32 -APPEND hd0 0 - -# http://www.memtest.org/ -LABEL memtest -MENU LABEL Run Memtest86+ (RAM test) -LINUX /%INSTALL_DIR%/boot/memtest - -# http://hdt-project.org/ -LABEL hdt -MENU LABEL Hardware Information (HDT) -COM32 hdt.c32 -APPEND modules_alias=hdt/modalias.gz pciids=hdt/pciids.gz - -LABEL reboot -MENU LABEL Reboot -COM32 reboot.c32 - -LABEL poweroff -MENU LABEL Power Off -COMBOOT poweroff.com - -ONTIMEOUT arch32 |