diff options
| author | Juuso Alasuutari | 2007-01-30 20:10:54 +0200 |
|---|---|---|
| committer | Jaka Kranjc | 2007-02-14 21:11:14 +0100 |
| commit | 0cb6a6061170b6bf45b5dc2a3ff66a360f33347d (patch) | |
| tree | 27ce6afd20fc94ffcb542cb1a4b520e8fb434239 | |
| parent | 77055155033172bffac04bd2978399ea357d3fd7 (diff) | |
udev: prompt to dispel hotplug if necessary
(cherry picked from commit 5107f503de9dbe89a707c80f292beedc9ec8fe13)
(cherry picked from commit efecdd618da6c121e2a881d80d42059717bbdfe9)
| -rwxr-xr-x | disk/udev/CONFIGURE | 14 | ||||
| -rwxr-xr-x | disk/udev/FINAL | 10 | ||||
| -rw-r--r-- | disk/udev/HISTORY | 4 |
3 files changed, 16 insertions, 12 deletions
diff --git a/disk/udev/CONFIGURE b/disk/udev/CONFIGURE index 0e29a3a22f..238e4f43ff 100755 --- a/disk/udev/CONFIGURE +++ b/disk/udev/CONFIGURE @@ -43,14 +43,14 @@ fi && persistent_add _EXTRAS_TARG && -if [[ -x /etc/init.d/runlevels/%S/hotplug ]] +if spell_ok 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." && + message "You seem to have hotplug installed. Hotplug has been" \ + "officially\ndeprecated in favor of udev, and it is" \ + "highly recommended that\nhotplug is removed after" \ + "udev has been installed." && - config_query HOTPLUG_BOOTDISABLE \ - "Disable init script hotplug?" \ + config_query UDEV_DISPEL_HOTPLUG \ + "Dispel hotplug after udev is cast?" \ y fi diff --git a/disk/udev/FINAL b/disk/udev/FINAL index 95264b5597..24396fd162 100755 --- a/disk/udev/FINAL +++ b/disk/udev/FINAL @@ -6,12 +6,12 @@ create_group burning create_group video create_group audio -# disable hotplug init -if [[ $HOTPLUG_BOOTDISABLE == y ]] && - [[ -x /etc/init.d/runlevels/%S/hotplug ]] +# dispel hotplug +if [[ $UDEV_DISPEL_HOTPLUG == y ]] then - telinit bootdisable hotplug - persistent_remove HOTPLUG_BOOTDISABLE + # we don't care if these fail + dispel hotplug + persistent_remove UDEV_DISPEL_HOTPLUG fi && # warn of coming changes diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY index eb1cd7c775..cf8e3406fc 100644 --- a/disk/udev/HISTORY +++ b/disk/udev/HISTORY @@ -1,3 +1,7 @@ +2007-01-30 Juuso Alasuutari <iuso@sourcemage.org> + * CONFIGURE: Prompt to dispel hotplug instead of just bootdisable. + * FINAL: Changed bootdisable hotplug to dispel. + 2007-01-27 Juuso Alasuutari <iuso@sourcemage.org> * CONFLICTS: Made 'conflicts udev-old' default to y to handle upgrades smoother. |