New commits:
commit cdfc2a8ed881d483efd7469d8867432679375d72
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>
udev: more fixing of #13417, removed conflicts hotplug (now relying on
the dispel_self trigger in hotplug), added query for bootdisabling
hotplug's init script after cast to prevent hotplug & udev redundancy
commit c09569b48318c134436bc5cec959edb20f06514c
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>
hotplug: forgot to bump patchlevel
commit e23633c10801e84927061ff692a3427a2b5697a1
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>
hotplug: more fixing to #13417; dispel self on udev cast
diff --git a/disk/udev/CONFIGURE b/disk/udev/CONFIGURE
index fec797e..0e29a3a 100755
--- a/disk/udev/CONFIGURE
+++ b/disk/udev/CONFIGURE
@@ -41,4 +41,16 @@ then
_EXTRAS_TARG="$_EXTRAS_TARG extras/usb_id"
fi &&
-persistent_add _EXTRAS_TARG
+persistent_add _EXTRAS_TARG &&
+
+if [[ -x /etc/init.d/runlevels/%S/hotplug ]]
+then
+ message "You seem to have hotplug's init script enabled. This" \
+ "version of udev\nreplaces hotplug as the default" \
+ "module autoloading utility, so it is\nrecommended" \
+ "that you disable hotplug's init script." &&
+
+ config_query HOTPLUG_BOOTDISABLE \
+ "Disable init script hotplug?" \
+ y
+fi
diff --git a/disk/udev/CONFLICTS b/disk/udev/CONFLICTS
index bf07bd2..5fa1573 100755
--- a/disk/udev/CONFLICTS
+++ b/disk/udev/CONFLICTS
@@ -1,2 +1 @@
conflicts udev-old n
-conflicts hotplug n
diff --git a/disk/udev/FINAL b/disk/udev/FINAL
index 822b61f..95264b5 100755
--- a/disk/udev/FINAL
+++ b/disk/udev/FINAL
@@ -6,6 +6,14 @@ create_group burning
create_group video
create_group audio
+# disable hotplug init
+if [[ $HOTPLUG_BOOTDISABLE == y ]] &&
+ [[ -x /etc/init.d/runlevels/%S/hotplug ]]
+then
+ telinit bootdisable hotplug
+ persistent_remove HOTPLUG_BOOTDISABLE
+fi &&
+
# warn of coming changes
message "\n${PROBLEM_COLOR}About persistent net interfaces naming:" \
"$DEFAULT_COLOR$MESSAGE_COLOR" \
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index a26fbe6..1167888 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,11 @@
+2007-01-24 Juuso Alasuutari <iuso AT sourcemage.org>
+ * CONFLICTS: Removed conflicts hotplug, the dispelling is better
+ handled by a trigger in hotplug itself (prevents hotplug from
+ being removed before udev cast success is certain).
+ * CONFIGURE: Prompt about disabling hotplug's init script if
+ it's enabled.
+ * FINAL: Bootdisable hotplug's init if user allowed it.
+
2007-01-21 Juuso Alasuutari <iuso AT sourcemage.org>
* all: These edits are aimed at fixing bug #13417.
* PRE_BUILD: Moved kernel version check here from PREPARE
diff --git a/kernels/hotplug/DETAILS b/kernels/hotplug/DETAILS
index bf5f800..362cead 100755
--- a/kernels/hotplug/DETAILS
+++ b/kernels/hotplug/DETAILS
@@ -2,13 +2,12 @@
VERSION=2004\_09\_23
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-# SOURCE_URL[0]=$SOURCEFORGE_URL/linux-hotplug/$SOURCE
SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/kernel/hotplug/$SOURCE