From 86ca33e76d88683f54bfb29ecb599afbd3ad7e91 Mon Sep 17 00:00:00 2001 From: Thomas Bächler Date: Thu, 22 Jul 2010 00:04:46 +0200 Subject: Rename all occurrences of isolinux to syslinux The name of the bootloader is syslinux, while isolinux is just one of many components. isolinux.bin now also accepts syslinux.cfg as a configuration file name (as do all other loaders). Thus, rename the isolinux/ folder to syslinux/, and rename isolinux.cfg to syslinux.cfg. The only occurrence of 'isolinux' is now the actual loader file 'isolinux.bin'. This makes the transition from isolinux to the other syslinux loaders easier when remastering the ISO onto another medium. --- archiso2dual/Makefile | 2 +- archiso2dual/README | 4 +-- archiso2dual/archiso2dual | 40 ++++++++++++------------ archiso2dual/isolinux.cfg | 80 ----------------------------------------------- archiso2dual/syslinux.cfg | 80 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 103 insertions(+), 103 deletions(-) delete mode 100644 archiso2dual/isolinux.cfg create mode 100644 archiso2dual/syslinux.cfg (limited to 'archiso2dual') diff --git a/archiso2dual/Makefile b/archiso2dual/Makefile index 6d37c71..c216e11 100644 --- a/archiso2dual/Makefile +++ b/archiso2dual/Makefile @@ -4,7 +4,7 @@ install: all install -D -m 755 archiso2dual $(DESTDIR)/usr/sbin/archiso2dual install -d -m 755 $(DESTDIR)/usr/share/archiso2dual/ install -D -m 644 isomounts $(DESTDIR)/usr/share/archiso2dual/isomounts - install -D -m 644 isolinux.cfg $(DESTDIR)/usr/share/archiso2dual/isolinux.cfg + install -D -m 644 syslinux.cfg $(DESTDIR)/usr/share/archiso2dual/syslinux.cfg install -D -m 644 removefiles.lst $(DESTDIR)/usr/share/archiso2dual/removefiles.lst uninstall: diff --git a/archiso2dual/README b/archiso2dual/README index 10e6451..5e18aed 100644 --- a/archiso2dual/README +++ b/archiso2dual/README @@ -9,10 +9,10 @@ running with profile "split": | |-- i686 | | |-- archiso.img | | `-- vmlinuz26 -| |-- isolinux +| |-- syslinux | | |-- boot.cat | | |-- isolinux.bin -| | |-- isolinux.cfg +| | |-- syslinux.cfg | | `-- memdisk | |-- memtest | |-- memtest.COPYING diff --git a/archiso2dual/archiso2dual b/archiso2dual/archiso2dual index 4726007..5b17b4a 100755 --- a/archiso2dual/archiso2dual +++ b/archiso2dual/archiso2dual @@ -17,7 +17,7 @@ quiet="y" profile_type="basic" work_dir="/tmp/archiso2dual" isomounts_file="/usr/share/archiso2dual/isomounts" -isolinuxcfg_file="/usr/share/archiso2dual/isolinux.cfg" +syslinuxcfg_file="/usr/share/archiso2dual/syslinux.cfg" removefiles_file="/usr/share/archiso2dual/removefiles.lst" appname=${0##*/} _error="0" @@ -47,20 +47,20 @@ kernel_copy() { done } -isolinux_copy() { +syslinux_copy() { echo "Executing: ${FUNCNAME}" cp ${_v} $work_dir/i686/mnt/boot/{memtest*,releasenotes.txt,splash.png} $work_dir/iso/boot/ - cp ${_v} $work_dir/i686/mnt/boot/isolinux/*.c32 $work_dir/iso/boot/isolinux/ - cp ${_v} $work_dir/i686/mnt/boot/isolinux/memdisk $work_dir/iso/boot/isolinux/ - cp ${_v} $work_dir/i686/mnt/boot/isolinux/isolinux.bin $work_dir/iso/boot/isolinux/ - cp ${_v} $work_dir/i686/mnt/boot/isolinux/pxelinux.0 $work_dir/iso/boot/isolinux/ - cp ${_v} $work_dir/i686/mnt/boot/isolinux/gpxelinux.0 $work_dir/iso/boot/isolinux/ - cp ${_v} -r $work_dir/i686/mnt/boot/isolinux/hdt $work_dir/iso/boot/isolinux/ + cp ${_v} $work_dir/i686/mnt/boot/syslinux/*.c32 $work_dir/iso/boot/syslinux/ + cp ${_v} $work_dir/i686/mnt/boot/syslinux/memdisk $work_dir/iso/boot/syslinux/ + cp ${_v} $work_dir/i686/mnt/boot/syslinux/isolinux.bin $work_dir/iso/boot/syslinux/ + cp ${_v} $work_dir/i686/mnt/boot/syslinux/pxelinux.0 $work_dir/iso/boot/syslinux/ + cp ${_v} $work_dir/i686/mnt/boot/syslinux/gpxelinux.0 $work_dir/iso/boot/syslinux/ + cp ${_v} -r $work_dir/i686/mnt/boot/syslinux/hdt $work_dir/iso/boot/syslinux/ } -isolinuxcfg_copy() { +syslinuxcfg_copy() { echo "Executing: ${FUNCNAME}" - sed "s|XXX|${label}|g" ${isolinuxcfg_file} > $work_dir/iso/boot/isolinux/isolinux.cfg + sed "s|XXX|${label}|g" ${syslinuxcfg_file} > $work_dir/iso/boot/syslinux/syslinux.cfg } isomounts_copy() { @@ -83,7 +83,7 @@ make_iso() { _qflag="" fi mkisofs ${_v} ${_qflag} -r -l \ - -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat \ + -b boot/syslinux/isolinux.bin -c boot/syslinux/boot.cat \ -uid 0 -gid 0 \ -udf -allow-limited-size -iso-level 3 \ -input-charset utf-8 -p "prepared by archiso2dual" \ @@ -203,7 +203,7 @@ make_workspace() { mkdir ${_v} -p ${work_dir}/${_arch}/mnt mkdir ${_v} -p ${work_dir}/tmp/${_arch} done - mkdir ${_v} -p ${work_dir}/iso/boot/isolinux + mkdir ${_v} -p ${work_dir}/iso/boot/syslinux mkdir ${_v} -p ${work_dir}/iso/any mkdir ${_v} -p ${work_dir}/tmp/any } @@ -222,8 +222,8 @@ show_help() echo " general options:" echo " -M Path to isomounts file (default to '${isomounts_file}'" - echo " -S Path to isolinux.cfg file - (default to '${isolinuxcfg_file}'" + echo " -S Path to syslinux.cfg file + (default to '${syslinuxcfg_file}'" echo " -R Path to removefiles file (default to '${removefiles_file}'" echo " -w Set work directory @@ -252,7 +252,7 @@ show_config() { echo " source iso x86_64 image: ${isofile_x86_64}" echo " target iso image: ${imgname}" echo " isomounts file: ${isomounts_file}" - echo " isolinux.cfg file: ${isolinuxcfg_file}" + echo " syslinux.cfg file: ${syslinuxcfg_file}" echo " removefiles.lst file: ${removefiles_file}" echo " working directory: ${work_dir}" echo " profile: ${profile_type}" @@ -309,8 +309,8 @@ sanity_check() { _error="1" fi - if [ ! -f "${isolinuxcfg_file}" ]; then - echo "*ERROR*: ${isolinuxcfg_file} does not exist, specify one with -S option" + if [ ! -f "${syslinuxcfg_file}" ]; then + echo "*ERROR*: ${syslinuxcfg_file} does not exist, specify one with -S option" _error="1" fi @@ -345,7 +345,7 @@ while getopts '3:6:o:T:M:S:R:L:P:A:yvh' arg; do esac ;; M) isomounts_file="${OPTARG}" ;; - S) isolinuxcfg_file="${OPTARG}" ;; + S) syslinuxcfg_file="${OPTARG}" ;; R) removefiles_file="${OPTARG}" ;; L) label="${OPTARG}" ;; P) publisher="${OPTARG}" ;; @@ -370,11 +370,11 @@ fi make_workspace iso_mount kernel_copy -isolinux_copy +syslinux_copy squashfs_copy check_if_core_medium iso_umount -isolinuxcfg_copy +syslinuxcfg_copy isomounts_copy if [ ${profile_type} = "full" ] || [ ${profile_type} = "split" ]; then root_image_extract diff --git a/archiso2dual/isolinux.cfg b/archiso2dual/isolinux.cfg deleted file mode 100644 index c32b9fd..0000000 --- a/archiso2dual/isolinux.cfg +++ /dev/null @@ -1,80 +0,0 @@ -DEFAULT vesamenu.c32 -PROMPT 0 -MENU TITLE Arch Linux -MENU BACKGROUND /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 6 -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 - -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) -KERNEL /boot/i686/vmlinuz26 -APPEND initrd=/boot/i686/archiso.img archisolabel=XXX rw_branch_size=75% locale=en_US.UTF-8 -# Next line should be uncommented when prepare enviroment to boot from PXE. -#IPAPPEND 3 - -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) -KERNEL /boot/x86_64/vmlinuz26 -APPEND initrd=/boot/x86_64/archiso.img archisolabel=XXX rw_branch_size=75% locale=en_US.UTF-8 -# Next line should be uncommented when prepare enviroment to boot from PXE. -#IPAPPEND 3 - -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 -KERNEL chain.c32 -APPEND hd0 0 - -# http://www.memtest.org/ -LABEL memtest -MENU LABEL Run Memtest86+ (RAM test) -KERNEL /boot/memtest - -# http://hdt-project.org/ -LABEL hdt -MENU LABEL Hardware Information (HDT) -KERNEL hdt.c32 -APPEND modules_alias=hdt/modalias.gz pciids=hdt/pciids.gz - -LABEL reboot -MENU LABEL Reboot -KERNEL reboot.c32 - -ONTIMEOUT arch32 diff --git a/archiso2dual/syslinux.cfg b/archiso2dual/syslinux.cfg new file mode 100644 index 0000000..c32b9fd --- /dev/null +++ b/archiso2dual/syslinux.cfg @@ -0,0 +1,80 @@ +DEFAULT vesamenu.c32 +PROMPT 0 +MENU TITLE Arch Linux +MENU BACKGROUND /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 6 +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 + +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) +KERNEL /boot/i686/vmlinuz26 +APPEND initrd=/boot/i686/archiso.img archisolabel=XXX rw_branch_size=75% locale=en_US.UTF-8 +# Next line should be uncommented when prepare enviroment to boot from PXE. +#IPAPPEND 3 + +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) +KERNEL /boot/x86_64/vmlinuz26 +APPEND initrd=/boot/x86_64/archiso.img archisolabel=XXX rw_branch_size=75% locale=en_US.UTF-8 +# Next line should be uncommented when prepare enviroment to boot from PXE. +#IPAPPEND 3 + +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 +KERNEL chain.c32 +APPEND hd0 0 + +# http://www.memtest.org/ +LABEL memtest +MENU LABEL Run Memtest86+ (RAM test) +KERNEL /boot/memtest + +# http://hdt-project.org/ +LABEL hdt +MENU LABEL Hardware Information (HDT) +KERNEL hdt.c32 +APPEND modules_alias=hdt/modalias.gz pciids=hdt/pciids.gz + +LABEL reboot +MENU LABEL Reboot +KERNEL reboot.c32 + +ONTIMEOUT arch32 -- cgit v1.2.3-70-g09d2