Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archiso2dual
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2010-11-30 23:43:04 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2010-12-07 23:48:24 -0300
commit85d2ddd7629a7124ee7b34af6a54ef793a844d8e (patch)
treedde2fa1c22ae3beb26efbdd5675a130a40b3673c /archiso2dual
parent06a8c66eaec5d1bace2ddefc2220c172d81eb2ff (diff)
Unify scheme of sed replacements.
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Diffstat (limited to 'archiso2dual')
-rwxr-xr-xarchiso2dual/archiso2dual2
-rw-r--r--archiso2dual/syslinux.cfg4
2 files changed, 3 insertions, 3 deletions
diff --git a/archiso2dual/archiso2dual b/archiso2dual/archiso2dual
index 760b36f..e3d9bfe 100755
--- a/archiso2dual/archiso2dual
+++ b/archiso2dual/archiso2dual
@@ -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
}
diff --git a/archiso2dual/syslinux.cfg b/archiso2dual/syslinux.cfg
index fbe3405..d520330 100644
--- a/archiso2dual/syslinux.cfg
+++ b/archiso2dual/syslinux.cfg
@@ -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