diff options
| -rwxr-xr-x | helpers/lh_binary_debian-installer | 2 | ||||
| -rwxr-xr-x | helpers/lh_binary_syslinux | 10 | ||||
| -rwxr-xr-x | helpers/lh_bootstrap_cdebootstrap | 2 | ||||
| -rwxr-xr-x | helpers/lh_bootstrap_copy | 2 | ||||
| -rwxr-xr-x | helpers/lh_chroot_sysv-rc | 2 | ||||
| -rwxr-xr-x | helpers/lh_clean | 2 | ||||
| -rwxr-xr-x | helpers/lh_source_debian | 2 | ||||
| -rwxr-xr-x | helpers/lh_source_iso | 2 | ||||
| -rwxr-xr-x | helpers/lh_source_net | 2 | ||||
| -rwxr-xr-x | helpers/lh_source_tar | 2 | ||||
| -rwxr-xr-x | helpers/lh_source_usb-hdd | 2 |
11 files changed, 15 insertions, 15 deletions
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index 7be41b8..3a16a19 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -272,7 +272,7 @@ fi mkdir -p "${DESTDIR_DI}" -if [ "${LH_ARCHITECTURE}" = "sparc" ] && [ "${DI_IMAGE_TYPE}" = "netboot" ] +if [ "${LH_ARCHITECTURE}" = "sparc" ] && [ "${DI_IMAGE_TYPE}" = "netboot" ] then # There are no prepared kernel/initrd pairs for sparc netboot so we # must unpack them from a mini.iso diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux index 89f3fc0..57304e3 100755 --- a/helpers/lh_binary_syslinux +++ b/helpers/lh_binary_syslinux @@ -186,8 +186,8 @@ Copy_syslinux_templates () cp "${TEMPLATES}"/menu/*.cfg ${SCREEN_PATH} cp "${TEMPLATES}"/menu/data/* ${DATA_PATH} - # Grab menu binary from chroot - MENUMODULE=$(grep 'menu.c32' ${TEMPLATES}/menu/header.cfg | sed 's|default\s*.*/\(.*menu.c32\)$|\1|g') + # Grab menu binary from chroot + MENUMODULE=$(grep 'menu.c32' ${TEMPLATES}/menu/header.cfg | sed 's|default\s*.*/\(.*menu.c32\)$|\1|g') cp chroot/usr/lib/syslinux/"${MENUMODULE}" ${DATA_PATH} fi @@ -236,9 +236,9 @@ Copy_syslinux_templates () else if [ "${LH_SYSLINUX_MENU}" = "disabled" ] then - SPLASH="${LIVE_DATA_PATH}/splash.rle" + SPLASH="${LIVE_DATA_PATH}/splash.rle" else - SPLASH="${LIVE_DATA_PATH}/splash.png" + SPLASH="${LIVE_DATA_PATH}/splash.png" fi if [ -n "${LH_SYSLINUX_SPLASH}" ] @@ -293,7 +293,7 @@ Configure_syslinux_templates () d }' ${SCREEN_PATH}/syslinux.cfg - # remove the files, which were included + # remove the files, which were included if [ -e ${SCREEN_PATH}/${FILE_NAME} ] then rm -f ${SCREEN_PATH}/${FILE_NAME} diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap index 557831f..df006e3 100755 --- a/helpers/lh_bootstrap_cdebootstrap +++ b/helpers/lh_bootstrap_cdebootstrap @@ -79,7 +79,7 @@ fi if [ -n "${LH_BOOTSTRAP_KEYRING}" ] then - CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LH_BOOTSTRAP_KEYRING}" + CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LH_BOOTSTRAP_KEYRING}" fi if [ -z "${LH_BOOTSTRAP_FLAVOUR}" ] diff --git a/helpers/lh_bootstrap_copy b/helpers/lh_bootstrap_copy index 4c65b39..2b3c199 100755 --- a/helpers/lh_bootstrap_copy +++ b/helpers/lh_bootstrap_copy @@ -51,7 +51,7 @@ Check_lockfile .lock Create_lockfile .lock # Copying host system -find / ! -name /proc ! -name /sys ! -name "$(dirname ${PWD})" | xargs cp -a chroot +find / ! -name /proc ! -name /sys ! -name "$(dirname ${PWD})" | xargs cp -a chroot # Creating stage file Create_stagefile .stage/bootstrap diff --git a/helpers/lh_chroot_sysv-rc b/helpers/lh_chroot_sysv-rc index 11634a0..d4e9352 100755 --- a/helpers/lh_chroot_sysv-rc +++ b/helpers/lh_chroot_sysv-rc @@ -51,7 +51,7 @@ case "${1}" in fi # Create policy-rc.d file -cat > chroot/usr/sbin/policy-rc.d << EOF +cat > chroot/usr/sbin/policy-rc.d << EOF #!/bin/sh echo diff --git a/helpers/lh_clean b/helpers/lh_clean index 00b348d..773d530 100755 --- a/helpers/lh_clean +++ b/helpers/lh_clean @@ -74,7 +74,7 @@ do ;; --binary) - ${LH_ROOT_COMMAND} umount -f binary.tmp > /dev/null 2>&1 || true + ${LH_ROOT_COMMAND} umount -f binary.tmp > /dev/null 2>&1 || true rm -rf binary.tmp binary.deb binary.udeb rm -f binary.iso rm -f binary.img diff --git a/helpers/lh_source_debian b/helpers/lh_source_debian index fa7b109..bd515d7 100755 --- a/helpers/lh_source_debian +++ b/helpers/lh_source_debian @@ -94,7 +94,7 @@ rm -f chroot/root/dpkg-selection.txt # Sort sources for DSC in chroot/*.dsc do - SOURCE="$(sed -n 's|^Source: ||p' ${DSC})" + SOURCE="$(sed -n 's|^Source: ||p' ${DSC})" case "${SOURCE}" in lib?*) diff --git a/helpers/lh_source_iso b/helpers/lh_source_iso index 0cb0243..31a4a85 100755 --- a/helpers/lh_source_iso +++ b/helpers/lh_source_iso @@ -35,7 +35,7 @@ fi if ! echo "${LH_SOURCE_IMAGES}" | grep -qs iso then - exit 0 + exit 0 fi Echo_message "Begin building source iso image..." diff --git a/helpers/lh_source_net b/helpers/lh_source_net index 77c7aed..76c9f94 100755 --- a/helpers/lh_source_net +++ b/helpers/lh_source_net @@ -35,7 +35,7 @@ fi if ! echo "${LH_SOURCE_IMAGES}" | grep -qs net then - exit 0 + exit 0 fi Echo_message "Begin building source netboot image..." diff --git a/helpers/lh_source_tar b/helpers/lh_source_tar index 4e00db6..df8be3b 100755 --- a/helpers/lh_source_tar +++ b/helpers/lh_source_tar @@ -35,7 +35,7 @@ fi if ! echo "${LH_SOURCE_IMAGES}" | grep -qs tar then - exit 0 + exit 0 fi Echo_message "Begin building source tarball..." diff --git a/helpers/lh_source_usb-hdd b/helpers/lh_source_usb-hdd index 01ca6cf..82d1913 100755 --- a/helpers/lh_source_usb-hdd +++ b/helpers/lh_source_usb-hdd @@ -35,7 +35,7 @@ fi if ! echo "${LH_SOURCE_IMAGES}" | grep -qs usb-hdd then - exit 0 + exit 0 fi Echo_message "Begin building source usb-hdd image..." |