From 85d2ddd7629a7124ee7b34af6a54ef793a844d8e Mon Sep 17 00:00:00 2001
From: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Date: Tue, 30 Nov 2010 23:43:04 -0300
Subject: [PATCH] Unify scheme of sed replacements.

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
---
 archiso/mkarchiso                                     | 2 +-
 archiso2dual/archiso2dual                             | 2 +-
 archiso2dual/syslinux.cfg                             | 4 ++--
 configs/syslinux-iso/boot-files/syslinux/syslinux.cfg | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index e0cf473..203d7f0 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -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."
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
 
diff --git a/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg b/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg
index 4a098f5..9b25021 100644
--- a/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg
+++ b/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg
@@ -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