projects / packages / geninitrd.git / blame
| Commit | Line | Data |
|---|---|---|
| 4c880565 AM |
1 | diff --git a/geninitrd b/geninitrd |
| 2 | index 7b962b5..a4de196 100755 | |
| 3 | --- a/geninitrd | |
| 4 | +++ b/geninitrd | |
| 5 | @@ -1103,8 +1103,7 @@ sym_exists() { | |
| 6 | # find best compressor (or forced one) for initrd | |
| 7 | find_compressor() { | |
| 8 | local mode="$1" | |
| 9 | - # fastest initrd decompression speed is first | |
| 10 | - local compressors='lzo gzip xz lzma bzip2' | |
| 11 | + local compressors='xz lzma bzip2 gzip lzo' | |
| 12 | ||
| 13 | # a specified one, take it | |
| 14 | if ! is_yes "$mode"; then | |
| 15 | diff --git a/mod-md.sh b/mod-md.sh | |
| 16 | index a0cd7aa..d9093d4 100644 | |
| 17 | --- a/mod-md.sh | |
| 18 | +++ b/mod-md.sh | |
| 19 | @@ -139,13 +139,15 @@ initrd_gen_md() { | |
| 20 | ||
| 21 | inst_exec $mdassemble /bin/mdassemble | |
| 22 | ||
| 23 | + echo "DEVICE partitions containers" >> "$DESTDIR/etc/mdadm.conf" | |
| 24 | + | |
| 25 | # LVM on RAID case | |
| 26 | local dev_list_extra ex_dev | |
| 27 | dev_list_extra=$(awk '/^DEVICE / { for (i=2; i<=NF; i++) { printf "%s ", $i; }; } ' /etc/mdadm.conf | xargs) | |
| 28 | new_dev_list_extra="" | |
| 29 | for ex_dev in $dev_list_extra; do | |
| 30 | - if [ "$ex_dev" = "partitions" ]; then | |
| 31 | - echo "DEVICE partitions" >> "$DESTDIR/etc/mdadm.conf" | |
| 32 | + if [ "$ex_dev" = "partitions" -o "$ex_dev" = "containers" ]; then | |
| 33 | + echo "DEVICE $ex_dev" >> "$DESTDIR/etc/mdadm.conf" | |
| 34 | # FIXME: find and copy partition devices from /proc/partitions | |
| 35 | # - best if done at runtime, now initrd gen time | |
| 36 | continue | |
| f9045633 AM |
37 | commit 11202855dbaee5bc32209913df1ae8738c210c39 |
| 38 | Author: Arkadiusz Miśkiewicz <arekm@maven.pl> | |
| 39 | Date: Sat May 14 00:36:02 2016 +0200 | |
| 40 | ||
| 41 | Make rootdev fallback work. | |
| 42 | ||
| 43 | diff --git a/geninitrd b/geninitrd | |
| 44 | index 92a519d..771245e 100755 | |
| 45 | --- a/geninitrd | |
| 46 | +++ b/geninitrd | |
| 47 | @@ -1004,7 +1004,11 @@ initrd_gen_initramfs_switchroot() { | |
| 48 | ||
| 49 | # XXX hack, fallback to rootdev from geninitrd time | |
| 50 | if [ ! -e "$device" ]; then | |
| 51 | + EOF | |
| 52 | + add_linuxrc <<-EOF | |
| 53 | device="$rootdev" | |
| 54 | + EOF | |
| 55 | + add_linuxrc <<-'EOF' | |
| 56 | echo "DEVICE set to $device based on fstab entry from initrd gen time" | |
| 57 | fi | |
| 58 |