Install blkid in /sbin because udevd expects it to be there.

diff --git a/geninitrd b/geninitrd
index a79b9c34a396d8ecc88a3c6656f71806830ac1ab..118333c77f31b5f5ec9473588ebf3ed350684616 100755 (executable)
--- a/geninitrd
+++ b/geninitrd
@@ -1530,7 +1530,7 @@ chmod a+rx "$RCFILE"
 ln -s linuxrc $DESTDIR/init
 
 # create dirs that we really need
-inst_d /{lib,bin,etc,dev{,/pts,/shm},loopfs,var,proc,run,sys,tmp}
+inst_d /{lib,bin,sbin,etc,dev{,/pts,/shm},loopfs,var,proc,run,sys,tmp}
 
 modules_install "$MODULES"
 

diff --git a/mod-blkid.sh b/mod-blkid.sh
index 8ee2a48f073b8c790920cacd0efc4cc70b2739bf..92df9aede517dcdb89ef9a4d4e513d293c63e261 100644 (file)
--- a/mod-blkid.sh
+++ b/mod-blkid.sh
@@ -22,12 +22,12 @@ initrd_gen_blkid() {
        fi
        verbose "Adding BLKID support to initrd"
 
-       inst_exec $blkid /bin/blkid
+       inst_exec $blkid /sbin/blkid
        initrd_gen_devices
        add_linuxrc <<-'EOF'
                # if built with blkid change ROOT=LABEL=something into ROOT=/dev/device parsed by blkid
                if [ "${ROOT##LABEL=}" != "${ROOT}" -o "${ROOT##UUID=}" != "${ROOT}" ]; then
-                       blkid="$(/bin/blkid -t $ROOT -o device -l)"
+                       blkid="$(/sbin/blkid -t $ROOT -o device -l)"
                        if [ -n "$blkid" ]; then
                                ROOT=$blkid
                        fi