|
|
|
@ -74,6 +74,32 @@ ln -s /proc/mounts /etc/mtab # to shut up mke2fs |
|
|
|
|
touch /etc/udev/hwdb.bin # to shut up udev |
|
|
|
|
touch /etc/initrd-release |
|
|
|
|
|
|
|
|
|
# Function for waiting a device to appear. |
|
|
|
|
waitDevice() { |
|
|
|
|
local device="$1" |
|
|
|
|
|
|
|
|
|
# USB storage devices tend to appear with some delay. It would be |
|
|
|
|
# great if we had a way to synchronously wait for them, but |
|
|
|
|
# alas... So just wait for a few seconds for the device to |
|
|
|
|
# appear. |
|
|
|
|
if test ! -e $device; then |
|
|
|
|
echo -n "waiting for device $device to appear..." |
|
|
|
|
try=20 |
|
|
|
|
while [ $try -gt 0 ]; do |
|
|
|
|
sleep 1 |
|
|
|
|
# also re-try lvm activation now that new block devices might have appeared |
|
|
|
|
lvm vgchange -ay |
|
|
|
|
# and tell udev to create nodes for the new LVs |
|
|
|
|
udevadm trigger --action=add |
|
|
|
|
if test -e $device; then break; fi |
|
|
|
|
echo -n "." |
|
|
|
|
try=$((try - 1)) |
|
|
|
|
done |
|
|
|
|
echo |
|
|
|
|
[ $try -ne 0 ] |
|
|
|
|
fi |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
# Mount special file systems. |
|
|
|
|
specialMount() { |
|
|
|
|
local device="$1" |
|
|
|
@ -377,31 +403,7 @@ lustrateRoot () { |
|
|
|
|
exec 4>&- |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
# Function for waiting a device to appear. |
|
|
|
|
waitDevice() { |
|
|
|
|
local device="$1" |
|
|
|
|
|
|
|
|
|
# USB storage devices tend to appear with some delay. It would be |
|
|
|
|
# great if we had a way to synchronously wait for them, but |
|
|
|
|
# alas... So just wait for a few seconds for the device to |
|
|
|
|
# appear. |
|
|
|
|
if test ! -e $device; then |
|
|
|
|
echo -n "waiting for device $device to appear..." |
|
|
|
|
try=20 |
|
|
|
|
while [ $try -gt 0 ]; do |
|
|
|
|
sleep 1 |
|
|
|
|
# also re-try lvm activation now that new block devices might have appeared |
|
|
|
|
lvm vgchange -ay |
|
|
|
|
# and tell udev to create nodes for the new LVs |
|
|
|
|
udevadm trigger --action=add |
|
|
|
|
if test -e $device; then break; fi |
|
|
|
|
echo -n "." |
|
|
|
|
try=$((try - 1)) |
|
|
|
|
done |
|
|
|
|
echo |
|
|
|
|
[ $try -ne 0 ] |
|
|
|
|
fi |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Try to resume - all modules are loaded now. |
|
|
|
|