diff -u dkms-2.0.20.4/debian/changelog dkms-2.0.20.4/debian/changelog --- dkms-2.0.20.4/debian/changelog +++ dkms-2.0.20.4/debian/changelog @@ -1,3 +1,11 @@ +dkms (2.0.20.4-0ubuntu2.1) intrepid-proposed; urgency=low + + * Backport fixes from git HEAD to prevent udevadm trigger + from running. It has potential to cause system corruption. + (LP: #320200) + + -- Mario Limonciello Thu, 22 Jan 2009 15:09:19 -0600 + dkms (2.0.20.4-0ubuntu2) intrepid; urgency=low * Backport these fixes from trunk: only in patch2: unchanged: --- dkms-2.0.20.4.orig/dkms +++ dkms-2.0.20.4/dkms @@ -367,6 +367,8 @@ CLEAN="" REMAKE_INITRD="" remake_initrd="" + UDEV_TRIGGER="" + udev_trigger="no" PACKAGE_NAME="" PACKAGE_VERSION="" POST_ADD="" @@ -577,6 +579,9 @@ # Set remake_initrd [ `echo "$REMAKE_INITRD" | grep -ic "^y"` -gt 0 ] && remake_initrd="yes" + # Set udev_trigger + [ `echo "$UDEV_TRIGGER" | grep -ic "^n"` -gt 0 ] && udev_trigger="no" + # Set build_exclude if [ -n "$BUILD_EXCLUSIVE_KERNEL" ]; then echo $1 | egrep -q "$BUILD_EXCLUSIVE_KERNEL" || build_exclude="yes" @@ -1289,10 +1294,10 @@ fi fi - # Notify udev if we installed something for the currently running kernel - if [ -x /sbin/udevadm -a "${kernelver_array[0]}" == "$(uname -r)" -a "${arch_array[0]}" == "$(uname -m)" ]; then + # Notify udev if we installed something for the currently running kernel as long as UDEV_TRIGGER is not set to no + if [ "${udev_trigger}" == "yes" -a -x /sbin/udevadm -a "${kernelver_array[0]}" == "$(uname -r)" -a "${arch_array[0]}" == "$(uname -m)" ]; then /sbin/udevadm trigger - elif [ -x /sbin/udevtrigger -a "${kernelver_array[0]}" == "$(uname -r)" -a "${arch_array[0]}" == "$(uname -m)" ]; then + elif [ "${udev_trigger}" == "yes" -a -x /sbin/udevtrigger -a "${kernelver_array[0]}" == "$(uname -r)" -a "${arch_array[0]}" == "$(uname -m)" ]; then /sbin/udevtrigger fi