projects / packages / geninitrd.git / blame
| Commit | Line | Data |
|---|---|---|
| 3a06c815 AM |
1 | commit 33cc4751b8f80fc3b800928b9ad93866b2569915 |
| 2 | Author: Arkadiusz Miśkiewicz <arekm@maven.pl> | |
| 3 | Date: Tue Dec 18 14:33:12 2018 +0100 | |
| 4 | ||
| 5 | Install blkid in /sbin because udevd expects it to be there. | |
| 6 | ||
| 7 | diff --git a/geninitrd b/geninitrd | |
| 8 | index a79b9c3..118333c 100755 | |
| 9 | --- a/geninitrd | |
| 10 | +++ b/geninitrd | |
| 11 | @@ -1530,7 +1530,7 @@ chmod a+rx "$RCFILE" | |
| 12 | ln -s linuxrc $DESTDIR/init | |
| 13 | ||
| 14 | # create dirs that we really need | |
| 15 | -inst_d /{lib,bin,etc,dev{,/pts,/shm},loopfs,var,proc,run,sys,tmp} | |
| 16 | +inst_d /{lib,bin,sbin,etc,dev{,/pts,/shm},loopfs,var,proc,run,sys,tmp} | |
| 17 | ||
| 18 | modules_install "$MODULES" | |
| 19 | ||
| 20 | diff --git a/mod-blkid.sh b/mod-blkid.sh | |
| 21 | index 8ee2a48..92df9ae 100644 | |
| 22 | --- a/mod-blkid.sh | |
| 23 | +++ b/mod-blkid.sh | |
| 24 | @@ -22,12 +22,12 @@ initrd_gen_blkid() { | |
| 25 | fi | |
| 26 | verbose "Adding BLKID support to initrd" | |
| 27 | ||
| 28 | - inst_exec $blkid /bin/blkid | |
| 29 | + inst_exec $blkid /sbin/blkid | |
| 30 | initrd_gen_devices | |
| 31 | add_linuxrc <<-'EOF' | |
| 32 | # if built with blkid change ROOT=LABEL=something into ROOT=/dev/device parsed by blkid | |
| 33 | if [ "${ROOT##LABEL=}" != "${ROOT}" -o "${ROOT##UUID=}" != "${ROOT}" ]; then | |
| 34 | - blkid="$(/bin/blkid -t $ROOT -o device -l)" | |
| 35 | + blkid="$(/sbin/blkid -t $ROOT -o device -l)" | |
| 36 | if [ -n "$blkid" ]; then | |
| 37 | ROOT=$blkid | |
| 38 | fi | |
| 39 | ||
| 40 | commit dc5ca733ed6fe57dfa39d4598a6586069e41d0b0 | |
| 41 | Author: Arkadiusz Miśkiewicz <arekm@maven.pl> | |
| 42 | Date: Tue Dec 18 14:34:38 2018 +0100 | |
| 43 | ||
| 44 | Install mdadm in /sbin because udevd expects it to be there. | |
| 45 | ||
| 46 | diff --git a/mod-md.sh b/mod-md.sh | |
| 47 | index 2b6f587..a358517 100644 | |
| 48 | --- a/mod-md.sh | |
| 49 | +++ b/mod-md.sh | |
| 50 | @@ -133,7 +133,7 @@ initrd_gen_md() { | |
| 51 | fi | |
| 52 | verbose "Setting up mdadm..." | |
| 53 | ||
| 54 | - inst_exec $mdadm /bin/mdadm | |
| 55 | + inst_exec $mdadm /sbin/mdadm | |
| 56 | ||
| 57 | echo "DEVICE partitions containers" >> "$DESTDIR/etc/mdadm.conf" | |
| 58 | ||
| 59 | @@ -181,7 +181,7 @@ initrd_gen_md() { | |
| 60 | ||
| 61 | echo "wait_for_files $cr_dev_list" | add_linuxrc | |
| 62 | add_linuxrc <<-'EOF' | |
| 63 | - mdadm --assemble --scan | |
| 64 | + /sbin/mdadm --assemble --scan | |
| 65 | ||
| 66 | if [ "$DEBUGINITRD" ]; then | |
| 67 | [ -e /proc/mdstat ] && echo "/proc/mdstat contents:" && cat /proc/mdstat | |
| 68 | ||
| 69 | commit 3d81f1cd0bc557ad9a1f157b403f0396866c648c | |
| 70 | Author: Arkadiusz Miśkiewicz <arekm@maven.pl> | |
| 71 | Date: Tue Dec 18 14:38:55 2018 +0100 | |
| 72 | ||
| 73 | udevd uses ata_id and scsi_id, so install these. | |
| 74 | ||
| 75 | diff --git a/mod-udev.sh b/mod-udev.sh | |
| 76 | index 422ef3e..a2491ee 100644 | |
| 77 | --- a/mod-udev.sh | |
| 78 | +++ b/mod-udev.sh | |
| 79 | @@ -41,9 +41,11 @@ setup_mod_udev() { | |
| 80 | initrd_gen_udev() { | |
| 81 | verbose "Setting up udev..." | |
| 82 | ||
| 83 | - inst_d /sbin /etc/udev | |
| 84 | + inst_d /sbin /etc/udev /lib/udev | |
| 85 | inst_exec $udevd /sbin/udevd | |
| 86 | inst_exec $udevadm /sbin/udevadm | |
| 87 | + inst_exec /lib/udev/ata_id /lib/udev/ata_id | |
| 88 | + inst_exec /lib/udev/scsi_id /lib/udev/scsi_id | |
| 89 | inst /etc/udev/udev.conf /etc/udev/udev.conf | |
| 90 | # standard udev rules | |
| 91 | inst_rules 50-udev-default.rules 60-persistent-storage.rules 61-persistent-storage-edd.rules 80-drivers.rules 95-udev-late.rules \ | |
| 92 | ||
| 93 | commit 21ad0f7980ce6a0135e4a3c37a94472ed4f1320c | |
| 94 | Author: Arkadiusz Miśkiewicz <arekm@maven.pl> | |
| 95 | Date: Tue Dec 18 14:43:20 2018 +0100 | |
| 96 | ||
| 97 | Use existing mechanism for installing udev apps but install regular variants, too if initrd-variants don't exist. | |
| 98 | ||
| 99 | diff --git a/mod-udev.sh b/mod-udev.sh | |
| 100 | index a2491ee..87f4b68 100644 | |
| 101 | --- a/mod-udev.sh | |
| 102 | +++ b/mod-udev.sh | |
| 103 | @@ -44,8 +44,6 @@ initrd_gen_udev() { | |
| 104 | inst_d /sbin /etc/udev /lib/udev | |
| 105 | inst_exec $udevd /sbin/udevd | |
| 106 | inst_exec $udevadm /sbin/udevadm | |
| 107 | - inst_exec /lib/udev/ata_id /lib/udev/ata_id | |
| 108 | - inst_exec /lib/udev/scsi_id /lib/udev/scsi_id | |
| 109 | inst /etc/udev/udev.conf /etc/udev/udev.conf | |
| 110 | # standard udev rules | |
| 111 | inst_rules 50-udev-default.rules 60-persistent-storage.rules 61-persistent-storage-edd.rules 80-drivers.rules 95-udev-late.rules \ | |
| 112 | @@ -57,6 +55,8 @@ initrd_gen_udev() { | |
| 113 | for e in ata_id cdrom_id collect firmware scsi_id v4l_id; do | |
| 114 | if [ -e "$initrd_dir/udev/$e" ]; then | |
| 115 | inst_exec $initrd_dir/udev/$e /lib/udev/$e | |
| 116 | + elif [ -e "/lib/udev/$e" ]; then | |
| 117 | + inst_exec /lib/udev/$e /lib/udev/$e | |
| 118 | fi | |
| 119 | done | |
| 120 |