Browse Source

early: -e 's/udevsettle/udevadm settle/g' -e 's/udevtrigger/udevadm trigger/'

user/chris/old/ruby
Alejandro Mery 17 years ago
parent
commit
d01ef4dc65
2 changed files with 8 additions and 8 deletions
  1. +2
    -2
      target/early/build-initramfs.in
  2. +6
    -6
      target/early/initramfs/init.sh

+ 2
- 2
target/early/build-initramfs.in

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: target/early/build-initramfs.in
# Copyright (C) 2007 - 2008 The OpenSDE Project
# Copyright (C) 2007 - 2009 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
@ -72,7 +72,7 @@ initramfs_install_pattern() {
case "$pkg_name" in
udev)
echo -n "-n -e '/etc\/udev\//p;' -e '/lib.*\/udev\/devices\//p;' -e '/lib\/udev\/.*_id$/p;' "
echo "-e '/sbin\/\(udevd\|udevsettle\|udevtrigger\|udevadm\)$/P'"
echo "-e '/sbin\/\(udevd\|udevadm\)$/P'"
;;
lvm2)
echo "$@ -e '/sbin\/lvmdump$/d;'"

+ 6
- 6
target/early/initramfs/init.sh

@ -3,7 +3,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: target/early/initramfs/init.sh
# Copyright (C) 2007 - 2008 The OpenSDE Project
# Copyright (C) 2007 - 2009 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
@ -83,8 +83,8 @@ if [ -x /sbin/modprobe -a -n "$modules" ]; then
fi
title "Triggering coldplug"
check udevtrigger
check udevsettle
check udevadm trigger
check udevadm settle
status
sleep 2
@ -102,7 +102,7 @@ if [ ! -e "$root" ]; then
# try activating software raids
title "Activating RAID devices"
modprobe -q md-mod 2> /dev/null
udevsettle
udevadm settle
check mdadm -As --auto=yes
status
fi
@ -118,14 +118,14 @@ if [ ! -e "$root" ]; then
if [ "$want_lvm" != no -a -d /etc/lvm/archive ]; then
title "Activating LVM devices"
modprobe -q dm_mod 2> /dev/null
udevsettle
udevadm settle
check lvm vgchange -ay
status
fi
fi
if [ -n "$root" ]; then
udevsettle
udevadm settle
# give it a second chance to appear (delay 2s)
[ -e "$root" ] || sleep 2;

Loading…
Cancel
Save