]> git.pld-linux.org Git - projects/geninitrd.git/commitdiff
Cosmetics.
authorElan Ruusamäe <glen@pld-linux.org>
Fri, 20 Oct 2006 16:16:12 +0000 (16:16 +0000)
committerElan Ruusamäe <glen@pld-linux.org>
Fri, 20 Oct 2006 16:16:12 +0000 (16:16 +0000)
svn-id: @7884

geninitrd

index 1c2b099c51ff4a53356e033deed326f4e813ff37..5b8f4737630b24f228d6ea29afb51d5e9c9cc6d7 100755 (executable)
--- a/geninitrd
+++ b/geninitrd
@@ -66,6 +66,9 @@ usage () {
        exit 1
 }
 
+debug() {
+       [ -n "$verbose" ] && "$*"
+}
 
 find_depmod () {
        typeset mods module f level depfile first
@@ -75,7 +78,7 @@ find_depmod () {
        if [ -f $depfile ] ; then
                : ok
        else
-               echo "Error: no $depfile ! Run depmod and rerun geninitrd." 1>&2
+               echo >&2 "Error: no $depfile ! Run depmod and rerun geninitrd."
                exit 1
        fi
 
@@ -107,12 +110,12 @@ BEGIN { here = 0 }
 
        if [ "$mods" = "" ] ; then
                if [ "$1" != silent ] ; then
-                       echo "$origmodule: module not found in $depfile" 1>&2
+                       echo >&2 "$origmodule: module not found in $depfile"
                fi
                if ! is_no "$EXIT_IF_MISSING" ; then
                        exit 1
                else
-                       echo "If $origmodule isn't compiled in kernel then this initrd may not start your system". 1>&2
+                       echo >&2 "If $origmodule isn't compiled in kernel then this initrd may not start your system."
                fi
        fi
 
@@ -120,9 +123,9 @@ BEGIN { here = 0 }
        if [ "$level" = "" ] ; then
                level=0
        fi
-       level=$(awk "BEGIN{print $level + 1}")
+       level=$((level + 1))
        if [ $level -gt 20 ] ; then
-               echo "$origmodule: cycle in $depfile" 1>&2
+               echo >&2 "$origmodule: cycle in $depfile"
                exit 1
        fi
 
@@ -147,7 +150,7 @@ addmodule() {
                        return
                fi
 
-               echo "module $fmPath present in modules.dep, but not in filesystem (kernel = $kernel)" 1>&2
+               echo >&2 "module $fmPath present in modules.dep, but not in filesystem (kernel = $kernel)"
                exit 1
        fi
 
@@ -163,9 +166,9 @@ findmodule() {
        skiperrors=""
        modName=$1
 
-       if [ "$(echo $modName | awk '{print(substr($0,1,1));}')" = "-" ]; then
+       if [ ${modName#-} != ${modName} ]; then
                skiperrors=1
-               modName="$(echo $modName | awk '{print(substr($0,2));}')"
+               modName=${modName#-}
        fi
 
        # what's that?
@@ -179,16 +182,16 @@ findmodule() {
        fi
 
        if [ -n "$skiperrors" ]; then
-               allModulesToFind=`find_depmod silent $modName`
+               allModulesToFind=$(find_depmod silent $modName)
        else
-               allModulesToFind=`find_depmod normal $modName`
-               if [ $? != 0 ] ; then
+               allModulesToFind=$(find_depmod normal $modName)
+               if [ $? != 0 ]; then
                        exit 1
                fi
        fi
 
-       for mod in $allModulesToFind ; do
-               mod=$(echo $mod | awk '{sub(/^\/lib\/modules\/[^\/]*\//,"");print}')
+       for mod in $allModulesToFind; do
+               mod=$(echo $mod | awk '{sub(/^\/lib\/modules\/[^\/]*\//, ""); print}')
                addmodule $mod "$skiperrors"
        done
 }
@@ -198,7 +201,7 @@ inst() {
                echo "usage: inst <file> <destination>"
                return
        fi
-       [ -n "$verbose" ] && echo "$1 -> $2"
+       debug "$1 -> $2"
        cp "$1" "$2"
 }
 
@@ -234,40 +237,38 @@ find_root() {
                        case $rootFs in
                        ext2|ext3)
                                if [ ! -x /sbin/e2label ] ; then
-                                       echo "/sbin/e2label is missing" 1>&2
+                                       echo >&2 "/sbin/e2label is missing"
                                        exit 1
                                fi
                                get_label="get_label_ext2"
                                ;;
                        xfs)
                                if [ ! -x /usr/sbin/xfs_db ] ; then
-                                       echo "/usr/sbin/xfs_db is missing" 1>&2
+                                       echo >&2 "/usr/sbin/xfs_db is missing"
                                        exit 1
                                fi
                                get_label="get_label_xfs"
                                ;;
                        *)
-                               echo "LABEL on $rootFs in not supported by geninitrd" 1>&2
+                               echo >&2 "LABEL on $rootFs in not supported by geninitrd"
                                exit 1
                                ;;
                        esac
                        if [ ! -r /proc/partitions ] ; then
-                               echo '/proc/partitions is not readable'; 1>&2
+                               echo >&2 '/proc/partitions is not readable'
                                exit 1
                        fi
                        label=${rootdev#"LABEL="}
                        for dev in `awk 'BEGIN {getline;getline} {print "/dev/" $4}' /proc/partitions` ; do
                                if [ -r $dev ] && [ "$label" = "`$get_label $dev`" ] ; then
-                                       if [ -n "$verbose" ] ; then
-                                               echo "Using $dev as device for rootfs"
-                                       fi
+                                       debug "Using $dev as device for rootfs"
                                        rootdev=$dev
                                        rootdev_found=1
                                        break
                                fi
                        done
                        if [ "$rootdev_found." != "1." ] ; then
-                               echo "geninitrd can't find real device for LABEL=$label" 1>&2
+                               echo >&2 "geninitrd can't find real device for LABEL=$label"
                                exit 1
                        fi
                fi
@@ -284,40 +285,38 @@ find_root() {
                        case $rootFs in
                        ext2|ext3)
                                if [ ! -x /sbin/tune2fs ] ; then
-                                       echo "/sbin/tune2fs is missing" 1>&2
+                                       echo >&2 "/sbin/tune2fs is missing"
                                        exit 1
                                fi
                                get_uuid="get_uuid_ext2"
                                ;;
                        xfs)
                                if [ ! -x /usr/sbin/xfs_admin ] ; then
-                                       echo "/usr/sbin/xfs_admin is missing" 1>&2
+                                       echo >&2 "/usr/sbin/xfs_admin is missing"
                                        exit 1
                                fi
                                get_uuid="get_uuid_xfs"
                                ;;
                        *)
-                               echo "UUID on $rootFs in not supported by geninitrd" 1>&2
+                               echo >&2 "UUID on $rootFs in not supported by geninitrd"
                                exit 1
                                ;;
                        esac
                        if [ ! -r /proc/partitions ] ; then
-                               echo '/proc/partitions is not readable'; 1>&2
+                               echo >&2 '/proc/partitions is not readable'
                                exit 1
                        fi
                        uuid=${rootdev#"UUID="}
                        for dev in $(awk 'BEGIN {getline;getline} {print "/dev/" $4}' /proc/partitions); do
                                if [ -r $dev ] && [ "$uuid" = "`$get_uuid $dev`" ] ; then
-                                       if [ -n "$verbose" ] ; then
-                                               echo "Using $dev as device for rootfs"
-                                       fi
+                                       debug "Using $dev as device for rootfs"
                                        rootdev=$dev
                                        rootdev_found=1
                                        break
                                fi
                        done
                        if [ "$rootdev_found" != 1 ] ; then
-                               echo "geninitrd can't find real device for UUID=$uuid" 1>&2
+                               echo >&2 "geninitrd can't find real device for UUID=$uuid"
                                exit 1
                        fi
                fi
@@ -328,7 +327,7 @@ find_root() {
 
 find_modules_softraid() {
        if [ -f /etc/mdadm.conf ]; then
-               [ -n "$verbose" ] && echo "Finding RAID details using mdadm for rootdev=$1"
+               debug "Finding RAID details using mdadm for rootdev=$1"
                eval `/sbin/mdadm -v --examine --scan --config=/etc/mdadm.conf | awk -v rootdev="$1" '
                BEGIN {
                        found = "no";
@@ -365,7 +364,7 @@ find_modules_softraid() {
        fi
 
        if [ "$raidfound" != "yes" -a -f /etc/raidtab ]; then
-               echo "ERROR: raidtools are not longer supported. Please migrate to mdadm setup!" 1>&2
+               echo >&2 "ERROR: raidtools are not longer supported. Please migrate to mdadm setup!"
                exit 1
        fi
 
@@ -378,11 +377,11 @@ find_modules_softraid() {
                        findmodule "linear"
                        ;;
                *)
-                       echo "raid level $number (in mdadm config) not recognized" 1>&2
+                       echo >&2 "raid level $number (in mdadm config) not recognized"
                        ;;
                esac
        else
-               echo "ERROR: RAID devices not found for \"$1\", check your configuration!" 1>&2
+               echo >&2 "ERROR: RAID devices not found for \"$1\", check your configuration!"
                exit 1
        fi
 
@@ -417,7 +416,7 @@ find_modules_ide() {
 
        rootdev="$(echo "$1" | awk ' { gsub(/\/dev\//,NUL); gsub(/[0-9].*/, NUL); print $0 } ')"
        if [ "$pack_version_long" -lt "002004021" ]; then
-               [ -n "$verbose" ] && echo "Finding IDE modules for kernels <= 2.4.20"
+               debug "Finding IDE modules for kernels <= 2.4.20"
                for n in $PREIDEMODSOLD; do
                        findmodule "$n"
                done
@@ -426,7 +425,7 @@ find_modules_ide() {
                for n in $PREIDEMODS; do
                        if [ "X$n" = "Xunknown" ] ; then
                                if [ -f "$modulefile" ]; then
-                                       [ -n "$verbose" ] && echo "Finding IDE modules using ide_hostadapter"
+                                       debug "Finding IDE modules using ide_hostadapter"
                                        idemodules="`awk '/ide_hostadapter/ && ! /^[\t ]*#/ { print $3; }' $modulefile`"
                                        for na in $idemodules; do
                                                tryauto=0;
@@ -437,7 +436,7 @@ find_modules_ide() {
                                if [ "$tryauto" -eq 1 ]; then
                                        # If tryauto {{{
                                        if [ -r /usr/share/pci-database/ide.pci -a -r /proc/bus/pci/devices ]; then
-                                               [ -n "$verbose" ] && echo "Finding IDE modules using PCI ID database"
+                                               debug "Finding IDE modules using PCI ID database"
                                                # Finding IDE modules using PCI ID database {{{
                                                if is_yes "${ide_only_root}"; then
                                                        if [ -f /sys/block/${rootdev}/device/../../vendor -a -f /sys/block/${rootdev}/device/../../device ]; then
@@ -539,7 +538,7 @@ _lvm2_node_resolve() {
 _check_lvm() {
        local node="$1"
        if [ ! -e "$node" ]; then
-               echo "WARNING: check_lvm(): node $node doesn't exists!" 1>&2
+               echo >&2 "WARNING: check_lvm(): node $node doesn't exist!"
                return 1
        fi
 
@@ -548,7 +547,7 @@ _check_lvm() {
        rc=$?
 
        if [ $rc = 0 ]; then
-               [ -n "$verbose" ] && echo "$node is LVM1 node"
+               debug "$node is LVM1 node"
                # is lvm1
                return 0
        fi
@@ -563,9 +562,9 @@ _check_lvm() {
        fi
 
        if [ $rc = 0 ]; then
-               [ -n "$verbose" ] && echo "$node is lvm2 node"
+               debug "$node is lvm2 node"
        else
-               [ -n "$verbose" ] && echo "$node is not any lvm node"
+               debug "$node is not any lvm node"
        fi
        return $rc
 }
@@ -618,7 +617,7 @@ find_modules_for() {
                done
        # check to see if we need to set up a loopback filesystem
        elif is_yes "`echo "$1" | awk -F/ '{print($3);}' | awk '/loop/ { print "yes"; }'`" ; then
-               echo "Sorry, root on loop device isn't supported." 1>&2
+               echo >&2 "Sorry, root on loop device isn't supported."
                exit 1
                # TODO: rewrite for bsp and make nfs ready
                if [ ! -x /sbin/losetup ]; then
@@ -627,8 +626,8 @@ find_modules_for() {
                fi
                key="^# $(echo $1 | awk -F/ '{print($3);}' | tr '[a-z]' '[A-Z]'):"
                if ! is_yes "`awk '/'$key'/ { print( "yes"); }' $fstab`" ; then
-                       echo "The root filesystem is on a $1, but there is no magic entry in $fstab" 1>&2
-                       echo "for this device. Consult the geninitrd man page for more information" 1>&2
+                       echo >&2 "The root filesystem is on a $1, but there is no magic entry in $fstab"
+                       echo >&2 "for this device. Consult the geninitrd man page for more information"
                        exit 1
                fi
 
@@ -678,7 +677,7 @@ find_modules_for() {
                        echo "ERROR: LVM version $LVMTOOLSVERSION is not supported yet." >&2
                        exit 1
                fi
-               [ -n "$verbose" ] && echo "LVM $LVMTOOLSVERSION enabled"
+               debug "LVM $LVMTOOLSVERSION enabled"
                uselvm="yes"
        fi
 }
@@ -688,7 +687,7 @@ firmware_install_module_pre() {
        linuxrc="$2"
        firmware_files="$3"
 
-       [ -n "$verbose" ] && echo "Adding Firmwares ($firmware_files) to initrd for module $module"
+       debug "Adding Firmwares ($firmware_files) to initrd for module $module"
        mkdir -p $MNTIMAGE/proc
        mkdir -p $MNTIMAGE/sys
        # firmware not yet installed
@@ -701,7 +700,7 @@ cat "/lib/firmware/$FIRMWARE" > /sys$DEVPATH/data
 echo 0 > /sys$DEVPATH/loading
 exit 0
 EOF
-       chmod 755 "$MNTIMAGE/lib/firmware/firmware.sh"
+               chmod 755 "$MNTIMAGE/lib/firmware/firmware.sh"
        fi
 
        for firmware in $firmware_files; do
@@ -745,7 +744,7 @@ modules_add_linuxrc() {
 
                generic_module=$(echo "${module}" | awk ' { gsub("-", "_", $0) } { print $0; } ')
                sleep_var="$(eval echo \$MODULE_${generic_module}_USLEEP)"
-           firmware_var="$(eval echo \$MODULE_${generic_module}_FIRMWARE)"
+               firmware_var="$(eval echo \$MODULE_${generic_module}_FIRMWARE)"
 
                if [ -n "$verbose" ]; then
                        echo -n "Loading module [$module] "
@@ -871,11 +870,11 @@ while [ $# -gt 0 ]; do
                shift
                ;;
        --fs=*)
-               echo "Warning: --fs option is obsoleted. Use --initrdfs instead" 1>&2
+               echo >&2 "Warning: --fs option is obsoleted. Use --initrdfs instead"
                INITRDFS="`echo $1 | awk -F= '{print $2;}'`"
                ;;
        --fs)
-               echo "Warning: --fs option is obsoleted. Use --initrdfs instead" 1>&2
+               echo >&2 "Warning: --fs option is obsoleted. Use --initrdfs instead"
                INITRDFS="$2"
                shift
                ;;
@@ -923,7 +922,7 @@ if [ "x" = "x$INITRDFS" ] ; then
                        INITRDFS="rom"
                fi
        else
-               echo "Warning: FS configuration options is obsoleted. Use INITRDFS instead" 1>&2
+               echo >&2 "Warning: FS configuration options is obsoleted. Use INITRDFS instead"
                INITRDFS="$FS"
        fi
 fi
@@ -953,34 +952,34 @@ fi
 case "$INITRDFS" in
        ext2)
                if [ ! -x /sbin/mke2fs ]; then
-                       echo "/sbin/mke2fs is missing" 1>&2
+                       echo >&2 "/sbin/mke2fs is missing"
                        exit 1
                fi
                ;;
        rom)
                if [ ! -x /sbin/genromfs ]; then
-                       echo "/sbin/genromfs is missing" 1>&2
+                       echo >&2 "/sbin/genromfs is missing"
                        exit 1
                fi
                ;;
        cram)
                if [ ! -x /sbin/mkcramfs ]; then
-                       echo "/sbin/mkcramfs is missing" 1>&2
+                       echo >&2 "/sbin/mkcramfs is missing"
                        exit 1
                fi
                ;;
        initramfs)
                if [ ! -x /bin/cpio ]; then
-                       echo "/bin/cpio is missing" 1>&2
+                       echo >&2 "/bin/cpio is missing"
                        exit 1
                fi
                if [ ! -x /usr/bin/find ]; then
-                       echo "/usr/bin/find is missing" 1>&2
+                       echo >&2 "/usr/bin/find is missing"
                        exit 1
                fi
                ;;
        *)
-               echo "Filesystem $INITRDFS on initrd is not supported" 1>&2
+               echo >&2 "Filesystem $INITRDFS on initrd is not supported"
                exit 1
                ;;
 esac
@@ -990,24 +989,24 @@ if [ -n "$img_vers" ]; then
 fi
 
 if [ -z "$force" -a -f "$target" ]; then
-       echo "$target already exists." 1>&2
+       echo >&2 "$target already exists."
        exit 1
 fi
 
 if [ ! -d "/lib/modules/$kernel" ]; then
-       echo "/lib/modules/$kernel is not a directory." 1>&2
+       echo >&2 "/lib/modules/$kernel is not a directory."
        exit 1
 fi
 
 if is_yes "$USE_SUSPEND"; then
        if is_yes "$USE_SUSPEND2"; then
-               echo "Suspend2 shouldn't be used in parallel with mainline suspend!." 1>&2
+               echo >&2 "Suspend2 shouldn't be used in parallel with mainline suspend!."
                exit 1
        fi
 fi
 
 if [ ! -f /proc/mounts ]; then
-       echo "WARNING: /proc filesystem not mounted, may cause wrong results or failure." 1>&2
+       echo >&2 "WARNING: /proc filesystem not mounted, may cause wrong results or failure."
 fi
 
 if [ "$pack_version" -lt "002005" ]; then
@@ -1049,15 +1048,11 @@ if is_yes "$USE_SUSPEND2"; then
 fi
 
 if [ -n "$ifneeded" -a -z "$MODULES" ]; then
-       if [ -n "$verbose" ]; then
-               echo "No modules are needed -- not building initrd image."
-       fi
+       debug "No modules are needed -- not building initrd image."
        exit 0
 fi
 
-if [ -n "$verbose" ]; then
-       echo "Using modules: $MODULES"
-fi
+debug "Using modules: $MODULES"
 
 MNTIMAGE="`mktemp -d /tmp/initrd.XXXXXX`"
 IMAGE="`mktemp -u /tmp/initrd.img-XXXXXX`"
@@ -1065,12 +1060,12 @@ MNTPOINT="`mktemp -d /tmp/initrd.mnt-XXXXXX`"
 RCFILE="$MNTIMAGE/linuxrc"
 
 if [ -f "$MNTIMAGE" ]; then
-       echo "$MNTIMAGE already exists. Remove it and try again" 1>&2
+       echo >&2 "$MNTIMAGE already exists. Remove it and try again"
        exit 1
 fi
 
 if [ -f "$IMAGE" ]; then
-       echo "$IMAGE already exists. Remove it and try again" 1>&2
+       echo >&2 "$IMAGE already exists. Remove it and try again"
        exit 1
 fi
 
@@ -1167,7 +1162,7 @@ EOF
 }
 
 initrd_gen_udev() {
-       [ -n "$verbose" ] && echo "Setting up udev..."
+       debug "Setting up udev..."
        mkdir -p $MNTIMAGE/sbin
        mkdir -p $MNTIMAGE/proc
        mkdir -p $MNTIMAGE/etc/udev
@@ -1221,7 +1216,7 @@ EOF
 
 
 initrd_gen_softraid() {
-       [ -n "$verbose" ] && echo "Setting up mdadm..."
+       debug "Setting up mdadm..."
 
        if [ ! -x /sbin/mdadm -o ! -x /sbin/initrd-mdassemble ] ; then
                echo "/sbin/mdadm or /sbin/initrd-mdassemble is missing !"
@@ -1239,7 +1234,7 @@ initrd_gen_softraid() {
        for nr in `seq 1 $rootdev_nr`; do
                eval cr_rootdev="\$rootdev${nr}"
                eval cr_dev_list="\$dev_list${nr}"
-               [ -n "$verbose" ] && echo "Setting up array ($cr_rootdev = $cr_dev_list)"
+               debug echo "Setting up array ($cr_rootdev = $cr_dev_list)"
 
                [ "$cr_rootdev" = "/dev/md0" ] && do_md0=0
 
@@ -1256,7 +1251,7 @@ initrd_gen_softraid() {
                        # mkdir in case of devfs name
                        mkdir -p $MNTIMAGE/`dirname $f`
                        [ -e "$MNTIMAGE/$f" ] && continue
-                       [ -n "$verbose" ] && echo "copying $f"
+                       debug echo "copying $f"
                        # this works fine with and without devfs
                        cp -HR $f $MNTIMAGE/$f
                done
@@ -1273,7 +1268,7 @@ initrd_gen_softraid() {
 initrd_gen_nfs() {
        # use root=/dev/ram0 init=/linuxrc when starting kernel or you will
        # have problems like init(XX) being child process of swapper(1).
-       [ -n "$verbose" ] && echo "Adding rootfs on NFS support to initrd (dhcp)"
+       debug "Adding rootfs on NFS support to initrd (dhcp)"
        mknod "$MNTIMAGE/dev/urandom" c 1 8
        mkdir "$MNTIMAGE/newroot"
        mkdir "$MNTIMAGE/proc"
@@ -1327,7 +1322,7 @@ EOF
 }
 
 initrd_gen_lvm() {
-       [ -n "$verbose" ] && echo "Adding LVM support to initrd"
+       debug "Adding LVM support to initrd"
        inst /sbin/initrd-lvm $MNTIMAGE/bin/lvm
        mkdir -p $MNTIMAGE/etc
        mkdir -p $MNTIMAGE/tmp
@@ -1380,7 +1375,7 @@ initrd_gen_lvm() {
                read a
                read a
                while read major minor blocks dev; do
-                       mknod /dev/\$dev b \$major \$minor
+                       mknod /dev/\$dev b \$major \$minor
                done
                ) < /proc/partitions
 
@@ -1413,7 +1408,7 @@ EOF
 }
 
 initrd_gen_procdata() {
-       [ -n "$verbose" ] && echo "Adding rootfs finding based on root= option support."
+       debug "Adding rootfs finding based on root= option support."
        mkdir -p $MNTIMAGE/proc
 cat << 'EOF' >> "$s"
 set +x
@@ -1480,7 +1475,7 @@ chmod +x "$RCFILE"
 case "$INITRDFS" in
        ext2)
                IMAGESIZE=$(du -ks $MNTPOINT | awk '{print int(($1+1023)/1024)*1024}')
-               [ "$verbose" ] && echo "ext2 image size: $IMAGESIZE ($MNTPOINT)"
+               debug   "ext2 image size: $IMAGESIZE ($MNTPOINT)"
                if [ "$IMAGESIZE" -gt 4096 ]; then
                        echo >&2 "$0: Your image size is larger than 4096, You should add ramdisk_size=$IMAGESIZE to your kernel commandline!"
                fi
@@ -1517,23 +1512,23 @@ fi
 
 if is_yes "$BOOT_SPLASH"; then
        if [ ! -x /bin/splash.bin ]; then
-               echo "Failed to execute /bin/splash.bin. Is bootsplash package installed?" 1>&2
+               echo >&2 "Failed to execute /bin/splash.bin. Is bootsplash package installed?"
        elif [ -z "$THEME" ]; then
-               echo "Please configure your /etc/sysconfig/bootsplash first." 1>&2
-               echo "Generating bootsplashes skipped." 1>&2
+               echo >&2 "Please configure your /etc/sysconfig/bootsplash first."
+               echo >&2 "Generating bootsplashes skipped."
        else
                if [ -n "$BOOT_SPLASH_RESOLUTIONS" ]; then
                        for res in $BOOT_SPLASH_RESOLUTIONS; do
                                if [ -f "/etc/bootsplash/themes/$THEME/config/bootsplash-$res.cfg" ]; then
                                        /bin/splash.bin -s -f "/etc/bootsplash/themes/$THEME/config/bootsplash-$res.cfg" >> "$target" && \
-                                       [ -n "$verbose" ] && echo "Added $res $THEME theme to initrd."
+                                       debug "Added $res $THEME theme to initrd."
                                else
-                                       echo "/etc/bootsplash/themes/$THEME/config/bootsplash-$res.cfg doesn't exist, skipped" 1>&2
+                                       echo >&2 "/etc/bootsplash/themes/$THEME/config/bootsplash-$res.cfg doesn't exist, skipped"
                                fi
                        done
                else
-                       echo "No BOOT_SPLASH_RESOLUTIONS specified in /etc/sysconfig/bootsplash." 1>&2
-                       echo "Not adding bootsplash to initrd." 1>&2
+                       echo >&2 "No BOOT_SPLASH_RESOLUTIONS specified in /etc/sysconfig/bootsplash."
+                       echo >&2 "Not adding bootsplash to initrd."
                fi
        fi
 fi
This page took 0.061432 seconds and 4 git commands to generate.