[projects/geninitrd] Install blkid in /sbin because udevd expects it to be there.
arekm
arekm at pld-linux.org
Tue Dec 18 14:34:41 CET 2018
commit 33cc4751b8f80fc3b800928b9ad93866b2569915
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Dec 18 14:33:12 2018 +0100
Install blkid in /sbin because udevd expects it to be there.
geninitrd | 2 +-
mod-blkid.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/geninitrd b/geninitrd
index a79b9c3..118333c 100755
--- 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 8ee2a48..92df9ae 100644
--- 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/geninitrd.git/commitdiff/dc5ca733ed6fe57dfa39d4598a6586069e41d0b0
More information about the pld-cvs-commit
mailing list