From 06af4162646e8715b38188447f20b727c8425bda Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sat, 11 May 2013 07:24:00 +0200 Subject: [PATCH] Kill trailing whitespaces!!!!! --- defaults/initrd.scripts | 46 ++++++++++++++++++----------------------- defaults/linuxrc | 10 +++------ gen_configkernel.sh | 14 ++++++------- gen_initramfs.sh | 7 +++---- 4 files changed, 33 insertions(+), 44 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 88f39cc..93a3463 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -1,4 +1,4 @@ -#!/bin/ash +#!/bin/sh . /etc/initrd.defaults @@ -169,7 +169,7 @@ findmediamount() { # $2 = recognition file # $3 = variable to have the device path # $4 = actual mount dir path (full path) - # args remaining are possible devices + # args remaining are possible devices local media=$1 recon=$2 vrbl=$3 mntdir=$4 shift 4 @@ -332,16 +332,15 @@ findnfsmount() { if [ "${NFSROOT}" = '' ] then - # Obtain NFSIP + # Obtain NFSIP OPTIONS=$(busybox dmesg | grep rootserver | sed -e "s/,/ /g") for OPTION in $OPTIONS do if [ $(echo $OPTION | sed -e "s/=/ /g" | cut -d " " -f 1) = 'rootserver' ] then NFSIP=$(echo $OPTION | sed -e "s/=/ /g" | cut -d " " -f 2) - fi + fi done - # Obtain NFSPATH OPTIONS=$(busybox dmesg | grep rootpath | sed -e "s/,/ /g") for OPTION in $OPTIONS @@ -383,7 +382,7 @@ findnfsmount() { else bad_msg "NFS Mounting failed. Is the path corrent ?" fi - else + else good_msg "Attempting to mount NFS root on ${NFSROOT} with options ${NFSOPTIONS}" mount -t nfs -o ${NFSOPTIONS} ${NFSROOT} ${NEW_ROOT} if [ "$?" = '0' ] @@ -433,11 +432,9 @@ find_real_device() { check_loop() { if [ "${LOOP}" = '' -o ! -e "${CDROOT_PATH}/${LOOP}" ] then - bad_msg "Invalid loop location: ${LOOP}" bad_msg 'Please export LOOP with a valid location, or reboot and pass a proper loop=...' bad_msg 'kernel command line!' - run_shell fi } @@ -487,7 +484,7 @@ mount_devfs () { test_success() { retcode=$? - # If last command failed send error message and fall back to a shell + # If last command failed send error message and fall back to a shell if [ "$retcode" != '0' ] then error_string=$1 @@ -518,7 +515,7 @@ bad_msg() { splashcmd verbose echo -e "${BAD}!!${NORMAL}${BOLD} ${msg_string} ${NORMAL}" fi -} +} warn_msg() { msg_string=$1 @@ -685,18 +682,17 @@ cmdline_hwopts() { fi done done - + # Shouldnt need to sort this as the following loop should figure out the # duplicates and strip them out #MY_HWOPTS=$(echo ${MY_HWOPTS}| sort) - for x in ${MY_HWOPTS} do FOUND=0 for y in ${TMP_HWOPTS} do if [ "${y}" = "${x}" ] - then + then continue 2 fi done @@ -736,7 +732,7 @@ setup_keymap() { [ -f /lib/keymaps/keymapList ] && chooseKeymap [ "${DEVBIND}" = '1' ] && umount /dev - + if [ -e /etc/sysconfig/keyboard -a "${CDROOT}" = '1' ] then mkdir -p ${NEW_ROOT}/etc/sysconfig/ @@ -827,7 +823,7 @@ startVolumes() { mkdir -p /dev/mapper ln -sf /dev/device-mapper /dev/mapper/control fi - + if [ "${USE_MDADM}" = '1' ] then if [ -e '/sbin/mdadm' ] @@ -838,15 +834,15 @@ startVolumes() { fi fi - if [ "${USE_MULTIPATH_NORMAL}" = '1' ] - then - good_msg "Scanning for multipath devices" + if [ "${USE_MULTIPATH_NORMAL}" = '1' ] + then + good_msg "Scanning for multipath devices" /sbin/multipath -v 0 sleep 2 - good_msg "Activating multipath devices" - /sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -a -v" + good_msg "Activating multipath devices" + /sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -a -v" #for MULTIPATH_VOLUMES in /dev/mapper/*; do kpartx -a $MULTIPATH_VOLUMES; done - fi + fi if [ "${USE_DMRAID_NORMAL}" = '1' ] then @@ -899,7 +895,7 @@ startVolumes() { bad_msg "vgscan or vgchange not found: skipping LVM volume group activation!" fi fi - + if [ "${USE_ZFS}" = '1' ] then if [ -z "${ZFS_POOL}" ] @@ -1058,10 +1054,10 @@ openLUKS() { cryptsetup_options="${cryptsetup_options} --allow-discards" fi - if [ -n "${LUKS_KEY}" ] + if [ -n "${LUKS_KEY}" ] then local REAL_LUKS_KEYDEV="${LUKS_KEYDEV}" - if [ ! -e "${mntkey}${LUKS_KEY}" ] + if [ ! -e "${mntkey}${LUKS_KEY}" ] then REAL_LUKS_KEYDEV=$(find_real_device "${LUKS_KEYDEV}") if [ -b "${REAL_LUKS_KEYDEV}" ] @@ -1155,9 +1151,7 @@ openLUKS() { } startLUKS() { - # if key is set but key device isn't, find it - [ -n "${CRYPT_ROOT_KEY}" ] && [ -z "${CRYPT_ROOT_KEYDEV}" ] \ && sleep 6 && bootstrapKey "ROOT" diff --git a/defaults/linuxrc b/defaults/linuxrc index 82aa77a..0fc60ae 100644 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -532,9 +532,8 @@ do prompt_user "REAL_ROOT" "root block device" continue fi - ROOT_DEV="${REAL_ROOT#*=}" - if [ "${ROOT_DEV}" != 'ZFS' ] + if [ "${ROOT_DEV}" != 'ZFS' ] then if [ "$(zfs get type -o value -H ${ROOT_DEV})" = 'filesystem' ] then @@ -563,10 +562,8 @@ do REAL_ROOT=${i} ROOTFSTYPE=zfs break - fi - - done; - + fi + done else got_good_root=0 fi @@ -577,7 +574,6 @@ do prompt_user "REAL_ROOT" "root block device" got_good_root=0 fi - continue ;; esac diff --git a/gen_configkernel.sh b/gen_configkernel.sh index a69c713..fbfed3e 100755 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -118,12 +118,12 @@ config_kernel() { fi # Multipath - if isTrue ${CMD_MULTIPATH} - then + if isTrue ${CMD_MULTIPATH} + then sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_BLK_DEV_DM is.*/CONFIG_BLK_DEV_DM=m/g' sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_DM_MULTIPATH is.*/CONFIG_DM_MULTIPATH=m/g' sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_DM_MULTIPATH_RDAC is.*/CONFIG_DM_MULTIPATH_RDAC=m/g' - fi + fi # Make sure dmraid modules are on if --dmraid if isTrue ${CMD_DMRAID} @@ -147,10 +147,10 @@ config_kernel() { then sed -i ${KERNEL_OUTPUTDIR}/.config -e 's/#\? \?CONFIG_FB_SPLASH is.*/CONFIG_FB_SPLASH=y/g' fi - + # VirtIO - if isTrue ${CMD_VIRTIO} - then + if isTrue ${CMD_VIRTIO} + then sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_PARAVIRT_GUEST.*/CONFIG_PARAVIRT_GUEST=y/g' sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VIRTIO_PCI.*/CONFIG_VIRTIO_PCI=y/g' sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VIRTIO_BALLOON.*/CONFIG_VIRTIO_BALLOON=y/g' @@ -159,5 +159,5 @@ config_kernel() { sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_SCSI_VIRTIO.*/CONFIG_SCSI_VIRTIO=y/g' sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VIRTIO_NET.*/CONFIG_VIRTIO_NET=y/g' sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VHOST_NET.*/CONFIG_VHOST_NET=y/g' - fi + fi } diff --git a/gen_initramfs.sh b/gen_initramfs.sh index f235dc5..01d19d6 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -14,7 +14,7 @@ CPIO_ARGS="--quiet -o -H newc" # CC0 are compatible with the GNU GPL." # (from https://www.gnu.org/licenses/license-list.html#CC0) # -# Written by: +# Written by: # - Sebastian Pipping (error checking) # - Robin H. Johnson (complete rewrite) # - Richard Yao (original concept) @@ -201,7 +201,7 @@ append_multipath(){ copy_binaries "${TEMP}/initramfs-multipath-temp" \ /bin/mountpoint \ /sbin/{multipath,kpartx,mpath_prio_*,devmap_name,dmsetup} \ - /{lib,lib64}/{udev/scsi_id,multipath/*so} + /{lib,lib64}/{udev/scsi_id,multipath/*so} if [ -x /sbin/multipath ] then @@ -647,7 +647,7 @@ append_modules() { find . | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ || gen_die "compressing modules cpio" cd "${TEMP}" - rm -r "${TEMP}/initramfs-modules-${KV}-temp/" + rm -r "${TEMP}/initramfs-modules-${KV}-temp/" } # check for static linked file with objdump @@ -903,7 +903,6 @@ create_initramfs() { gzip) compress_ext='.gz' compress_cmd="${cmd_gzip} -f -9" ;; lzop) compress_ext='.lzo' compress_cmd="${cmd_lzop} -f -9" ;; esac - if [ -n "${compression}" ]; then print_info 1 " >> Compressing cpio data (${compress_ext})..." ${compress_cmd} "${CPIO}" || gen_die "Compression (${compress_cmd}) failed"