Use cat and <<EOF. Redirect 2>/dev/null is only neccessary for vgchange.

[projects/geninitrd.git] / geninitrd

diff --git a/geninitrd b/geninitrd
index 65afc5192ed6cd32a849aa3b81a4fafc7e307f13..6be1f31bb2464bbe0cbeeb53622758a8f11d92a3 100755 (executable)
--- a/geninitrd
+++ b/geninitrd
@@ -1302,22 +1302,24 @@ initrd_gen_lvm() {
                lvm dumpconfig | awk '/filter=/' >> "$MNTIMAGE/etc/lvm.conf"
                echo "}" >> "$MNTIMAGE/etc/lvm.conf"
 
-               echo ": 'Scanning for Volume Groups'" >> "$s"
-               echo "LVM_SYSTEM_DIR=/tmp lvm vgscan --ignorelockingfailure 2>/dev/null" >> "$s"
-               echo ": 'Activating Volume Groups'" >> "$s"
-               echo "LVM_SYSTEM_DIR=/tmp lvm vgchange --ignorelockingfailure -a y $VGVOLUME 2>/dev/null" >> "$s"
+               cat <<-EOF >> "$s"
+               : 'Scanning for Volume Groups'
+               LVM_SYSTEM_DIR=/tmp lvm vgscan --ignorelockingfailure
+               : 'Activating Volume Groups'
+               LVM_SYSTEM_DIR=/tmp lvm vgchange --ignorelockingfailure -a y $VGVOLUME 2>/dev/null
 
                # Find out major/minor
-               echo "majmin=\"\`LVM_SYSTEM_DIR=/tmp lvm lvdisplay --ignorelockingfailure -c $org_rootdev\`\"" >> "$s"
-               echo "majmin=\"\${majmin#*/}\"" >> "$s"
-               echo "majmin=\"\${majmin#*:*:*:*:*:*:*:*:*:*:*:*}\"" >> "$s"
-               echo "major=\"\${majmin%:*}\"" >> "$s"
-               echo "minor=\"\${majmin#*:}\"" >> "$s"
+               majmin="\`LVM_SYSTEM_DIR=/tmp lvm lvdisplay --ignorelockingfailure -c $org_rootdev\`"
+               majmin="\${majmin#*/}"
+               majmin="\${majmin#*:*:*:*:*:*:*:*:*:*:*:*}"
+               major="\${majmin%:*}"
+               minor="\${majmin#*:}"
                # Pass it to kernel
-               echo "val=\$((256 * \$major + \$minor))" >> "$s"
-               echo "echo \$val > /proc/sys/kernel/real-root-dev" >> "$s"
-               echo "umount /tmp" >> "$s"
-               echo "umount /proc" >> "$s"
+               val=\$((256 * \$major + \$minor))
+               echo \$val > /proc/sys/kernel/real-root-dev
+               umount /tmp
+               umount /proc
+EOF
        fi
 }