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.
This commit is contained in:
Thomas Bächler
parent
deffe0fba9
commit
86ca33e76d
@ -230,8 +230,8 @@ _imgcommon () {
|
||||
|
||||
cp "${work_dir}/isomounts" "${work_dir}/iso/"
|
||||
|
||||
if ! sed "s|archisolabel=[^ ]*|archisolabel=${LABEL}|" -i ${work_dir}/iso/boot/isolinux/isolinux.cfg; then
|
||||
echo "Error: ${work_dir}/iso/boot/isolinux/isolinux.cfg, doesn't exist, aborting."
|
||||
if ! sed "s|archisolabel=[^ ]*|archisolabel=${LABEL}|" -i ${work_dir}/iso/boot/syslinux/syslinux.cfg; then
|
||||
echo "Error: ${work_dir}/iso/boot/syslinux/syslinux.cfg, doesn't exist, aborting."
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
@ -243,7 +243,7 @@ command_iso () {
|
||||
qflag=""
|
||||
[ "${QUIET}" = "y" ] && qflag="-quiet"
|
||||
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 \
|
||||
-udf -allow-limited-size -iso-level 3 \
|
||||
-input-charset utf-8 -p "prepared by mkarchiso" \
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 <isomounts> Path to isomounts file
|
||||
(default to '${isomounts_file}'"
|
||||
echo " -S <isolinux> Path to isolinux.cfg file
|
||||
(default to '${isolinuxcfg_file}'"
|
||||
echo " -S <syslinux> Path to syslinux.cfg file
|
||||
(default to '${syslinuxcfg_file}'"
|
||||
echo " -R <removefiles> Path to removefiles file
|
||||
(default to '${removefiles_file}'"
|
||||
echo " -w <workdir> 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
|
||||
|
||||
@ -41,15 +41,15 @@ bootfiles: root-image
|
||||
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 -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/isolinux.bin $(WORKDIR)/iso/boot/isolinux/
|
||||
cp $(WORKDIR)/root-image/usr/lib/syslinux/memdisk $(WORKDIR)/iso/boot/isolinux/
|
||||
cp $(WORKDIR)/root-image/usr/lib/syslinux/pxelinux.0 $(WORKDIR)/iso/boot/isolinux/
|
||||
cp $(WORKDIR)/root-image/usr/lib/syslinux/gpxelinux.0 $(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/syslinux/
|
||||
cp $(WORKDIR)/root-image/usr/lib/syslinux/memdisk $(WORKDIR)/iso/boot/syslinux/
|
||||
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/syslinux/
|
||||
# Add pci.ids and modules.alias for hdt
|
||||
mkdir -p $(WORKDIR)/iso/boot/isolinux/hdt/
|
||||
wget -O - http://pciids.sourceforge.net/v2.2/pci.ids | gzip -9 > $(WORKDIR)/iso/boot/isolinux/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
|
||||
mkdir -p $(WORKDIR)/iso/boot/syslinux/hdt/
|
||||
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/syslinux/hdt/modalias.gz
|
||||
|
||||
# Rules for initcpio images
|
||||
initcpio: $(WORKDIR)/iso/boot/archiso.img
|
||||
|
||||
Loading…
Reference in New Issue
Block a user