summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-11-11 13:57:11 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:22:28 +0100
commit532f4e281f1a1c4687f9841201cf85f46d6aec31 (patch)
tree17994e13c4facb5f885c0c8cef4762b1730697bb
parentc7ad124959cf6dc9275528805ff38b6fad82164e (diff)
downloadvyos-live-build-532f4e281f1a1c4687f9841201cf85f46d6aec31.tar.gz
vyos-live-build-532f4e281f1a1c4687f9841201cf85f46d6aec31.zip
Fixing some coding style issues.
-rwxr-xr-xhelpers/lh_binary_chroot2
-rwxr-xr-xhelpers/lh_binary_syslinux6
-rwxr-xr-xhelpers/lh_chroot_hacks38
3 files changed, 24 insertions, 22 deletions
diff --git a/helpers/lh_binary_chroot b/helpers/lh_binary_chroot
index c0727e06a..ad578cc4f 100755
--- a/helpers/lh_binary_chroot
+++ b/helpers/lh_binary_chroot
@@ -100,7 +100,7 @@ ${LH_ROOT_COMMAND} mv chroot.tmp chroot/chroot
if [ -f config/binary_rootfs/exclude ]
then
# Read exclude file and expand wildcards.
- for EXCLUDE in `cat config/binary_rootfs/exclude`
+ for EXCLUDE in $(cat config/binary_rootfs/exclude)
do
if [ -e chroot/chroot/"${EXCLUDE}" ]
then
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index afae5122b..98872476c 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -79,7 +79,7 @@ Utf8_to_latin1 ()
Syslinux_memtest_entry ()
{
LABEL="${1}"
- MENULABEL=`Utf8_to_latin1 "${2}"`
+ MENULABEL="$(Utf8_to_latin1 "${2}")"
KERNEL="${3}"
MEMTEST="${MEMTEST}\nLABEL ${LABEL}\n"
@@ -92,7 +92,7 @@ Syslinux_memtest_entry ()
Syslinux_live_entry ()
{
LABEL="${1}"
- MENULABEL=`Utf8_to_latin1 "${2}"`
+ MENULABEL="$(Utf8_to_latin1 "${2}")"
MENULABEL="${2}"
KERNEL="${3}"
INITRD="${4}"
@@ -233,7 +233,7 @@ Copy_syslinux_templates ()
else
rm -f ${SCREEN_PATH}/splash.rle
rm -f ${DATA_PATH}/splash.png
- cp -f "${LH_SYSLINUX_SPLASH}" ${DATA_PATH}/`basename ${SPLASH}`
+ cp -f "${LH_SYSLINUX_SPLASH}" ${DATA_PATH}/$(basename ${SPLASH})
fi
fi
fi
diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks
index aa5652daa..cd5420fb7 100755
--- a/helpers/lh_chroot_hacks
+++ b/helpers/lh_chroot_hacks
@@ -119,33 +119,35 @@ if [ "${LH_EXPOSED_ROOT}" = "enabled" ]
then
# Make sure RW dirs exist so that the initramfs script has
# a directory in which to bind the tmpfs filesystems
- COW_DIRS='/tmp /var/tmp /var/lock /var/run /var/lib/live /var/log
- /var/spool /home /live'
- for DIR in ${COW_DIRS}; do
- mkdir -p chroot${DIR}
+ COW_DIRECTORIES="/home /live /tmp /var/lib/live /var/lock /var/log /var/run /var/tmp /var/spool"
+
+ for DIRECTORY in ${COW_DIRECTORIES}
+ do
+ mkdir -p chroot/"${DIRECTORY}"
done
# Config files which need to be RW
- CONFIG_FILES='/etc/hostname /etc/hosts /etc/resolv.conf /etc/fstab
- /etc/live.conf /etc/network/interfaces /etc/X11/xorg.conf /etc/adjtime
- /etc/udev/rules.d/z25_persistent-net.rules
- /etc/udev/rules.d/z25_persistent-cd.rules'
+ COW_FILES="/etc/adjtime /etc/fstab /etc/hostname /etc/hosts /etc/live.conf /etc/network/interfaces /etc/resolv.conf /etc/udev/rules.d/z25_persistent-net.rules /etc/udev/rules.d/z25_persistent-cd.rules' /etc/X11/xorg.conf"
# Where we will store RW config files
- RW_DIR='/var/lib/live'
+ RW_DIRECTORY="/var/lib/live"
- for FILE_PATH in ${CONFIG_FILES}
+ for FILE in ${COW_FILES}
do
+ DIRECTORY="$(dirname ${FILE})"
+ FILE="$(basename ${FILE})"
+ RELATIVE_PATH="$(echo ${DIRECTORY} | sed 's/[^\/]\+/../g; s/^\///g')"
+
# Touch files in case they don't yet exist
- FILE_DIR=$(dirname ${FILE_PATH})
- mkdir -p chroot${FILE_DIR}
- touch chroot${FILE_PATH}
- FILE_NAME=$(basename ${FILE_PATH})
- mkdir -p chroot${RW_DIR}${FILE_DIR}
- mv chroot${FILE_PATH} chroot${RW_DIR}${FILE_DIR}
+ mkdir -p chroot/${DIRECTORY}
+ touch chroot/${DIRECTORY}/${FILE}
+
+ # Move files to the read-write directory
+ mkdir -p chroot/${RW_DIRECTORY}/${DIRECTORY}
+ mv chroot/${DIRECTORY}/${FILE} chroot/${RW_DIRECTORY}/${DIRECTORY}
+
# Create a symbolic link to RW config file
- RELATIVE_PATH=$(echo ${FILE_DIR}|sed 's/[^\/]\+/../g; s/^\///g')
- ln -s ${RELATIVE_PATH}${RW_DIR}${FILE_PATH} chroot${FILE_PATH}
+ ln -s ${RELATIVE_PATH}/${RW_DIRECTORY}/${DIRECTORY}/${FILE} chroot/${DIRECTORY}/${FILE}
done
# Mount doesn't write to a symlink so use /proc/mounts instead,