initramfs-tools: fix root on LVM.

Move wait_for_udev() before local-top scripts are run, otherwise
lvm vgscan won't find the devices. Bump revision.

--HG--
extra : convert_revision : 8eb56225cd2252aab272c4721d9a3b14d7367f83
This commit is contained in:
Juan RP 2009-10-06 17:47:22 +02:00
parent f368eafa41
commit 4cb99e3647
2 changed files with 33 additions and 18 deletions

View file

@ -69,23 +69,6 @@
run_scripts /usr/share/initramfs-tools/hooks
run_scripts "${CONFDIR}"/hooks
--- scripts/local.orig 2009-06-19 15:37:17.337740970 +0200
+++ scripts/local 2009-06-19 15:38:22.157057084 +0200
@@ -8,11 +8,11 @@ get_fstype ()
local FS FSTYPE FSSIZE RET
FS="${1}"
- # vol_id has a more complete list of file systems,
+ # blkid has a more complete list of file systems,
# but fstype is more robust
eval $(fstype "${FS}" 2> /dev/null)
- if [ "$FSTYPE" = "unknown" ] && [ -x /lib/udev/vol_id ]; then
- FSTYPE=$(/lib/udev/vol_id -t "${FS}" 2> /dev/null)
+ if [ "$FSTYPE" = "unknown" ] && [ -x /sbin/blkid ]; then
+ FSTYPE=$(/sbin/blkid -s TYPE -o value "${FS}" 2> /dev/null)
fi
RET=$?
--- scripts/init-top/keymap.orig 2009-08-27 07:25:39.071099923 +0200
+++ scripts/init-top/keymap 2009-08-27 07:25:57.336100046 +0200
@@ -16,12 +16,12 @@ esac
@ -232,3 +215,35 @@
worklist="${worklist} ${gsv_x} ${gsv_i}"
gsv_x=""
else
--- scripts/local.orig 2009-03-19 21:16:14.000000000 +0100
+++ scripts/local 2009-10-06 17:45:04.671054874 +0200
@@ -8,11 +8,11 @@ get_fstype ()
local FS FSTYPE FSSIZE RET
FS="${1}"
- # vol_id has a more complete list of file systems,
+ # blkid has a more complete list of file systems,
# but fstype is more robust
eval $(fstype "${FS}" 2> /dev/null)
- if [ "$FSTYPE" = "unknown" ] && [ -x /lib/udev/vol_id ]; then
- FSTYPE=$(/lib/udev/vol_id -t "${FS}" 2> /dev/null)
+ if [ "$FSTYPE" = "unknown" ] && [ -x /sbin/blkid ]; then
+ FSTYPE=$(/sbin/blkid -s TYPE -o value "${FS}" 2> /dev/null)
fi
RET=$?
@@ -26,12 +26,12 @@ get_fstype ()
pre_mountroot()
{
+ wait_for_udev 10
+
[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/local-top"
run_scripts /scripts/local-top
[ "$quiet" != "y" ] && log_end_msg
- wait_for_udev 10
-
# Don't wait for a root device that doesn't have a corresponding
# device in /dev (ie, mtd0)
if [ "${ROOT#/dev}" = "${ROOT}" ]; then

View file

@ -1,7 +1,7 @@
# Template file for 'initramfs-tools'
pkgname=initramfs-tools
version=0.93.2
revision=6
revision=7
wrksrc=$pkgname
patch_files="$pkgname-xbps.diff"
distfiles="${DEBIAN_SITE}/main/i/${pkgname}/${pkgname}_${version}.tar.gz"