diff options
author | Harald Hoyer <harald@redhat.com> | 2013-06-12 15:18:54 +0200 |
---|---|---|
committer | Harald Hoyer <harald@redhat.com> | 2013-06-12 15:18:54 +0200 |
commit | ac2958243963d0fcdf5617efa3cc7d61b4cf4281 (patch) | |
tree | d5e2ded98bce3cb36ad1628eaffdb990b5e154d3 /0031-lsinitrd.sh-do-not-output-filename-for-a-single-file.patch | |
parent | 44345d3ce100f7e4840b4f5495d6a12c2f48ce1d (diff) | |
download | dracut-ac2958243963d0fcdf5617efa3cc7d61b4cf4281.tar.gz dracut-ac2958243963d0fcdf5617efa3cc7d61b4cf4281.tar.xz dracut-ac2958243963d0fcdf5617efa3cc7d61b4cf4281.zip |
dracut-028-1
- lvm: fixed "thin" recognition
Resolves: rhbz#921235
- install libs also from one dir above
fixes booting power6 generated initramfs on power7
- setup correct system time and time zone in initrd
- cms fixups
Resolves: rhbz#970982 rhbz#971025 rhbz#825199
- iso-scan/filename fixes
Resolves: rhbz#972337
- add udev rules for persistent network naming
Resolves: rhbz#972662
Diffstat (limited to '0031-lsinitrd.sh-do-not-output-filename-for-a-single-file.patch')
-rw-r--r-- | 0031-lsinitrd.sh-do-not-output-filename-for-a-single-file.patch | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/0031-lsinitrd.sh-do-not-output-filename-for-a-single-file.patch b/0031-lsinitrd.sh-do-not-output-filename-for-a-single-file.patch deleted file mode 100644 index c30083b..0000000 --- a/0031-lsinitrd.sh-do-not-output-filename-for-a-single-file.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 4460416abcb420588d189dd5bac6860c79b67ab5 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Tue, 16 Apr 2013 13:33:40 +0200 -Subject: [PATCH] lsinitrd.sh: do not output filename for a single file - ---- - lsinitrd.sh | 41 ++++++++++++++++++++++++++--------------- - 1 file changed, 26 insertions(+), 15 deletions(-) - -diff --git a/lsinitrd.sh b/lsinitrd.sh -index 0481975..cd58529 100755 ---- a/lsinitrd.sh -+++ b/lsinitrd.sh -@@ -119,23 +119,34 @@ case $bin in - ;; - esac - --if (( ${#filenames[@]} > 0 )); then -- $CAT $image | cpio --extract --verbose --quiet --to-stdout ${!filenames[@]} 2>/dev/null -- exit $? --fi -- - ret=0 - --echo "$image: $(du -h $image | while read a b; do echo $a;done)" --echo "========================================================================" --$CAT "$image" | cpio --extract --verbose --quiet --to-stdout '*lib/dracut/dracut-*' 2>/dev/null --((ret+=$?)) --echo "========================================================================" --if [ "$sorted" -eq 1 ]; then -- $CAT "$image" | cpio --extract --verbose --quiet --list | sort -n -k5 -+if (( ${#filenames[@]} > 0 )); then -+ (( ${#filenames[@]} == 1 )) && nofileinfo=1 -+ for f in ${!filenames[@]}; do -+ [[ $nofileinfo ]] || echo "initramfs:/$f" -+ [[ $nofileinfo ]] || echo "========================================================================" -+ $CAT $image | cpio --extract --verbose --quiet --to-stdout $f 2>/dev/null -+ ((ret+=$?)) -+ [[ $nofileinfo ]] || echo "========================================================================" -+ [[ $nofileinfo ]] || echo -+ done - else -- $CAT "$image" | cpio --extract --verbose --quiet --list | sort -k9 -+ echo "Image: $image: $(du -h $image | while read a b; do echo $a;done)" -+ echo "========================================================================" -+ version=$($CAT "$image" | cpio --extract --verbose --quiet --to-stdout '*lib/dracut/dracut-*' 2>/dev/null) -+ ((ret+=$?)) -+ echo "$version with dracut modules:" -+ $CAT "$image" | cpio --extract --verbose --quiet --to-stdout 'usr/lib/dracut/modules.txt' 2>/dev/null -+ ((ret+=$?)) -+ echo "========================================================================" -+ if [ "$sorted" -eq 1 ]; then -+ $CAT "$image" | cpio --extract --verbose --quiet --list | sort -n -k5 -+ else -+ $CAT "$image" | cpio --extract --verbose --quiet --list | sort -k9 -+ fi -+ ((ret+=$?)) -+ echo "========================================================================" - fi --((ret+=$?)) --echo "========================================================================" -+ - exit $ret |