Unify scheme of sed replacements.
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
This commit is contained in:
parent
06a8c66eae
commit
85d2ddd762
@ -215,7 +215,7 @@ _imgcommon () {
|
||||
fi
|
||||
fi
|
||||
|
||||
if ! sed "s|archisolabel=[^ ]*|archisolabel=${LABEL}|g;
|
||||
if ! sed "s|%ARCHISO_LABEL%|${LABEL}|g;
|
||||
s|%INSTALL_DIR%|${INSTALL_DIR}|g;
|
||||
s|%ARCH%|${ARCH}|g" -i ${work_dir}/iso/syslinux/syslinux.cfg; then
|
||||
echo "Error: ${work_dir}/iso/syslinux/syslinux.cfg, doesn't exist, aborting."
|
||||
|
@ -64,7 +64,7 @@ syslinux_copy() {
|
||||
syslinuxcfg_copy() {
|
||||
echo "Executing: ${FUNCNAME}"
|
||||
for _cfg in ${syslinuxcfg_dir}/*.cfg; do
|
||||
sed "s|XXX|${label}|g;
|
||||
sed "s|%ARCHISO_LABEL%|${label}|g;
|
||||
s|%INSTALL_DIR%|${install_dir}|g" ${_cfg} > ${work_dir}/iso/syslinux/$(basename ${_cfg})
|
||||
done
|
||||
}
|
||||
|
@ -38,7 +38,7 @@ 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=XXX rw_branch_size=75% locale=en_US.UTF-8
|
||||
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
|
||||
|
||||
@ -49,7 +49,7 @@ 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=XXX rw_branch_size=75% locale=en_US.UTF-8
|
||||
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
|
||||
|
||||
|
@ -38,7 +38,7 @@ perform system maintenance.
|
||||
ENDTEXT
|
||||
MENU LABEL Boot Arch Linux
|
||||
LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz26
|
||||
APPEND initrd=/%INSTALL_DIR%/boot/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=XXX rw_branch_size=75% locale=en_US.UTF-8
|
||||
APPEND initrd=/%INSTALL_DIR%/boot/%ARCH%/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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user