summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaximilian attems <maks@debian.org>2006-03-14 10:43:28 +0100
committermaximilian attems <maks@debian.org>2006-03-14 10:43:28 +0100
commit9c42241824afb2759d22d2cf7962fb2ce534e0dd (patch)
tree2e5996092c6479b607c870081c37ae7e8d20181c
parentc4a1c8838be207397a4c676db729ed9de416bbba (diff)
downloadinitramfs-tools-9c42241824afb2759d22d2cf7962fb2ce534e0dd.tar.gz
initramfs-tools-9c42241824afb2759d22d2cf7962fb2ce534e0dd.zip
udev stuff needs to be in scripts/init-premount
only do the block device hacks on local boot
-rw-r--r--debian/changelog3
-rwxr-xr-xscripts/init-premount/udev_helper (renamed from scripts/local-top/udev_helper)11
2 files changed, 11 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 24506a6..8f2f7ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,7 @@ initramfs-tools (0.54) unstable; urgency=low
* hook-function: Add dac960 scsi driver. (closes: #355162)
- * scripts/local-top/udev_helper: moved from
- scripts/init-premount/udev_helper, add code by Scott James Remnant
+ * scripts/init-premount/udev_helper: add code by Scott James Remnant
<scott@ubuntu.com> from the ubuntu udev hook. We now wait on scsi
and usb devices to settle, load ide-generic on ide boot only if
no root device appeared.
diff --git a/scripts/local-top/udev_helper b/scripts/init-premount/udev_helper
index 8abcb2b..f2bc204 100755
--- a/scripts/local-top/udev_helper
+++ b/scripts/init-premount/udev_helper
@@ -1,6 +1,6 @@
#!/bin/sh
-PREREQ=""
+PREREQ="udev"
prereqs()
{
@@ -15,6 +15,15 @@ prereqs)
;;
esac
+# Nothing todo for nfs boot
+case "${BOOT}" in
+local)
+ ;;
+*)
+ exit 0
+ ;;
+esac
+
# Our job now is to make the block device for the root filesystem available.
# This is actually a bit trickier than it first appears because we first need
# to figure out which driver needs it, and to do that, we need to know what