faerbit/archiso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename all occurrences of isolinux to syslinux

Browse Source 
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.
This commit is contained in:
Thomas Bächler 2010-07-22 00:04:46 +02:00
parent deffe0fba9
commit 86ca33e76d
7 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archiso/mkarchiso
View File

@ -230,8 +230,8 @@ _imgcommon () {
cp "${work_dir}/isomounts" "${work_dir}/iso/" cp "${work_dir}/isomounts" "${work_dir}/iso/"
if ! sed "s|archisolabel=[^ ]*|archisolabel=${LABEL}|" -i ${work_dir}/iso/boot/isolinux/isolinux.cfg; then if ! sed "s|archisolabel=[^ ]*|archisolabel=${LABEL}|" -i ${work_dir}/iso/boot/syslinux/syslinux.cfg; then
echo "Error: ${work_dir}/iso/boot/isolinux/isolinux.cfg, doesn't exist, aborting." echo "Error: ${work_dir}/iso/boot/syslinux/syslinux.cfg, doesn't exist, aborting."
exit 1 exit 1
fi fi
} }
@ -243,7 +243,7 @@ command_iso () {
qflag="" qflag=""
[ "${QUIET}" = "y" ] && qflag="-quiet" [ "${QUIET}" = "y" ] && qflag="-quiet"
mkisofs ${qflag} -r -l \ mkisofs ${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 \ -uid 0 -gid 0 \
-udf -allow-limited-size -iso-level 3 \ -udf -allow-limited-size -iso-level 3 \
-input-charset utf-8 -p "prepared by mkarchiso" \ -input-charset utf-8 -p "prepared by mkarchiso" \

2
archiso2dual/Makefile
View File

@ -4,7 +4,7 @@ install: all
install -D -m 755 archiso2dual $(DESTDIR)/usr/sbin/archiso2dual install -D -m 755 archiso2dual $(DESTDIR)/usr/sbin/archiso2dual
install -d -m 755 $(DESTDIR)/usr/share/archiso2dual/ install -d -m 755 $(DESTDIR)/usr/share/archiso2dual/
install -D -m 644 isomounts $(DESTDIR)/usr/share/archiso2dual/isomounts 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 install -D -m 644 removefiles.lst $(DESTDIR)/usr/share/archiso2dual/removefiles.lst
uninstall: uninstall:

4
archiso2dual/README
View File

@ -9,10 +9,10 @@ running with profile "split":
| |-- i686 | |-- i686
| | |-- archiso.img | | |-- archiso.img
| | `-- vmlinuz26 | | `-- vmlinuz26
| |-- isolinux | |-- syslinux
| | |-- boot.cat | | |-- boot.cat
| | |-- isolinux.bin | | |-- isolinux.bin
| | |-- isolinux.cfg | | |-- syslinux.cfg
| | `-- memdisk | | `-- memdisk
| |-- memtest | |-- memtest
| |-- memtest.COPYING | |-- memtest.COPYING

40
archiso2dual/archiso2dual
View File

@ -17,7 +17,7 @@ quiet="y"
profile_type="basic" profile_type="basic"
work_dir="/tmp/archiso2dual" work_dir="/tmp/archiso2dual"
isomounts_file="/usr/share/archiso2dual/isomounts" 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" removefiles_file="/usr/share/archiso2dual/removefiles.lst"
appname=${0##*/} appname=${0##*/}
_error="0" _error="0"
@ -47,20 +47,20 @@ kernel_copy() {
done done
} }
isolinux_copy() { syslinux_copy() {
echo "Executing: ${FUNCNAME}" 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/{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/syslinux/*.c32 $work_dir/iso/boot/syslinux/
cp ${_v} $work_dir/i686/mnt/boot/isolinux/memdisk $work_dir/iso/boot/isolinux/ cp ${_v} $work_dir/i686/mnt/boot/syslinux/memdisk $work_dir/iso/boot/syslinux/
cp ${_v} $work_dir/i686/mnt/boot/isolinux/isolinux.bin $work_dir/iso/boot/isolinux/ cp ${_v} $work_dir/i686/mnt/boot/syslinux/isolinux.bin $work_dir/iso/boot/syslinux/
cp ${_v} $work_dir/i686/mnt/boot/isolinux/pxelinux.0 $work_dir/iso/boot/isolinux/ cp ${_v} $work_dir/i686/mnt/boot/syslinux/pxelinux.0 $work_dir/iso/boot/syslinux/
cp ${_v} $work_dir/i686/mnt/boot/isolinux/gpxelinux.0 $work_dir/iso/boot/isolinux/ cp ${_v} $work_dir/i686/mnt/boot/syslinux/gpxelinux.0 $work_dir/iso/boot/syslinux/
cp ${_v} -r $work_dir/i686/mnt/boot/isolinux/hdt $work_dir/iso/boot/isolinux/ cp ${_v} -r $work_dir/i686/mnt/boot/syslinux/hdt $work_dir/iso/boot/syslinux/
} }
isolinuxcfg_copy() { syslinuxcfg_copy() {
echo "Executing: ${FUNCNAME}" 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() { isomounts_copy() {
@ -83,7 +83,7 @@ make_iso() {
_qflag="" _qflag=""
fi fi
mkisofs ${_v} ${_qflag} -r -l \ 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 \ -uid 0 -gid 0 \
-udf -allow-limited-size -iso-level 3 \ -udf -allow-limited-size -iso-level 3 \
-input-charset utf-8 -p "prepared by archiso2dual" \ -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}/${_arch}/mnt
mkdir ${_v} -p ${work_dir}/tmp/${_arch} mkdir ${_v} -p ${work_dir}/tmp/${_arch}
done 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}/iso/any
mkdir ${_v} -p ${work_dir}/tmp/any mkdir ${_v} -p ${work_dir}/tmp/any
} }
@ -222,8 +222,8 @@ show_help()
echo " general options:" echo " general options:"
echo " -M <isomounts> Path to isomounts file echo " -M <isomounts> Path to isomounts file
(default to '${isomounts_file}'" (default to '${isomounts_file}'"
echo " -S <isolinux> Path to isolinux.cfg file echo " -S <syslinux> Path to syslinux.cfg file
(default to '${isolinuxcfg_file}'" (default to '${syslinuxcfg_file}'"
echo " -R <removefiles> Path to removefiles file echo " -R <removefiles> Path to removefiles file
(default to '${removefiles_file}'" (default to '${removefiles_file}'"
echo " -w <workdir> Set work directory echo " -w <workdir> Set work directory
@ -252,7 +252,7 @@ show_config() {
echo " source iso x86_64 image: ${isofile_x86_64}" echo " source iso x86_64 image: ${isofile_x86_64}"
echo " target iso image: ${imgname}" echo " target iso image: ${imgname}"
echo " isomounts file: ${isomounts_file}" echo " isomounts file: ${isomounts_file}"
echo " isolinux.cfg file: ${isolinuxcfg_file}" echo " syslinux.cfg file: ${syslinuxcfg_file}"
echo " removefiles.lst file: ${removefiles_file}" echo " removefiles.lst file: ${removefiles_file}"
echo " working directory: ${work_dir}" echo " working directory: ${work_dir}"
echo " profile: ${profile_type}" echo " profile: ${profile_type}"
@ -309,8 +309,8 @@ sanity_check() {
_error="1" _error="1"
fi fi
if [ ! -f "${isolinuxcfg_file}" ]; then if [ ! -f "${syslinuxcfg_file}" ]; then
echo "*ERROR*: ${isolinuxcfg_file} does not exist, specify one with -S option" echo "*ERROR*: ${syslinuxcfg_file} does not exist, specify one with -S option"
_error="1" _error="1"
fi fi
@ -345,7 +345,7 @@ while getopts '3:6:o:T:M:S:R:L:P:A:yvh' arg; do
esac esac
;; ;;
M) isomounts_file="${OPTARG}" ;; M) isomounts_file="${OPTARG}" ;;
S) isolinuxcfg_file="${OPTARG}" ;; S) syslinuxcfg_file="${OPTARG}" ;;
R) removefiles_file="${OPTARG}" ;; R) removefiles_file="${OPTARG}" ;;
L) label="${OPTARG}" ;; L) label="${OPTARG}" ;;
P) publisher="${OPTARG}" ;; P) publisher="${OPTARG}" ;;
@ -370,11 +370,11 @@ fi
make_workspace make_workspace
iso_mount iso_mount
kernel_copy kernel_copy
isolinux_copy syslinux_copy
squashfs_copy squashfs_copy
check_if_core_medium check_if_core_medium
iso_umount iso_umount
isolinuxcfg_copy syslinuxcfg_copy
isomounts_copy isomounts_copy
if [ ${profile_type} = "full" ] || [ ${profile_type} = "split" ]; then if [ ${profile_type} = "full" ] || [ ${profile_type} = "split" ]; then
root_image_extract root_image_extract

0
archiso2dual/isolinux.cfg → archiso2dual/syslinux.cfg
View File

16
configs/syslinux-iso/Makefile
View File

@ -41,15 +41,15 @@ bootfiles: root-image
cp $(WORKDIR)/root-image/boot/memtest86+/memtest.bin $(WORKDIR)/iso/boot/memtest cp $(WORKDIR)/root-image/boot/memtest86+/memtest.bin $(WORKDIR)/iso/boot/memtest
cp $(WORKDIR)/root-image/usr/share/licenses/common/GPL2/license.txt $(WORKDIR)/iso/boot/memtest.COPYING cp $(WORKDIR)/root-image/usr/share/licenses/common/GPL2/license.txt $(WORKDIR)/iso/boot/memtest.COPYING
cp -r boot-files/* $(WORKDIR)/iso/boot/ cp -r boot-files/* $(WORKDIR)/iso/boot/
cp $(WORKDIR)/root-image/usr/lib/syslinux/*.c32 $(WORKDIR)/iso/boot/isolinux/ cp $(WORKDIR)/root-image/usr/lib/syslinux/*.c32 $(WORKDIR)/iso/boot/syslinux/
cp $(WORKDIR)/root-image/usr/lib/syslinux/isolinux.bin $(WORKDIR)/iso/boot/isolinux/ cp $(WORKDIR)/root-image/usr/lib/syslinux/isolinux.bin $(WORKDIR)/iso/boot/syslinux/
cp $(WORKDIR)/root-image/usr/lib/syslinux/memdisk $(WORKDIR)/iso/boot/isolinux/ cp $(WORKDIR)/root-image/usr/lib/syslinux/memdisk $(WORKDIR)/iso/boot/syslinux/
cp $(WORKDIR)/root-image/usr/lib/syslinux/pxelinux.0 $(WORKDIR)/iso/boot/isolinux/ cp $(WORKDIR)/root-image/usr/lib/syslinux/pxelinux.0 $(WORKDIR)/iso/boot/syslinux/
cp $(WORKDIR)/root-image/usr/lib/syslinux/gpxelinux.0 $(WORKDIR)/iso/boot/isolinux/ cp $(WORKDIR)/root-image/usr/lib/syslinux/gpxelinux.0 $(WORKDIR)/iso/boot/syslinux/
# Add pci.ids and modules.alias for hdt # Add pci.ids and modules.alias for hdt
mkdir -p $(WORKDIR)/iso/boot/isolinux/hdt/ mkdir -p $(WORKDIR)/iso/boot/syslinux/hdt/
wget -O - http://pciids.sourceforge.net/v2.2/pci.ids | gzip -9 > $(WORKDIR)/iso/boot/isolinux/hdt/pciids.gz wget -O - http://pciids.sourceforge.net/v2.2/pci.ids | gzip -9 > $(WORKDIR)/iso/boot/syslinux/hdt/pciids.gz
cat $(WORKDIR)/root-image/lib/modules/$(shell grep ^ALL_kver $(kver_FILE) | cut -d= -f2)/modules.alias | gzip -9 > $(WORKDIR)/iso/boot/isolinux/hdt/modalias.gz cat $(WORKDIR)/root-image/lib/modules/$(shell grep ^ALL_kver $(kver_FILE) | cut -d= -f2)/modules.alias | gzip -9 > $(WORKDIR)/iso/boot/syslinux/hdt/modalias.gz
# Rules for initcpio images # Rules for initcpio images
initcpio: $(WORKDIR)/iso/boot/archiso.img initcpio: $(WORKDIR)/iso/boot/archiso.img

0
configs/syslinux-iso/boot-files/isolinux/isolinux.cfg → configs/syslinux-iso/boot-files/syslinux/syslinux.cfg
View File