[Xen-changelog] check_hotplug fails on one of my machines running ubunto 4.10 "Warty

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User emellor@xxxxxxxxxxxxxxxxxxxxxx
# Node ID 5ae89ce6748640a35e0866a7fe3ca258c03214be
# Parent  206731134e18a665a3f41bf26aa03e63d47c0a35
check_hotplug fails on one of my machines running ubunto 4.10 "Warty
Warhog", due to misparsing the udevinfo version string. The problem is
caused by an old version of sed that does not appreciate the
regexp. This patch fixes it, and also works on debian unstable and
SLES9SP2. Please apply...

Signed-Off-By: Muli Ben-Yehuda <mulix@xxxxxxxxx>
Signed-Off-By: Orna Agmon <ladypine@xxxxxxxxxxxx>

diff -r 206731134e18 -r 5ae89ce67486 install.sh
--- a/install.sh        Fri Nov 25 15:18:26 2005
+++ b/install.sh        Fri Nov 25 15:26:19 2005
@@ -28,7 +28,7 @@
 echo "All done."
 
 [ -x "$(which udevinfo)" ] && \
-  UDEV_VERSION=$(udevinfo -V | sed -e 's/^.*\s\([0-9]\+\)[^0-9]*/\1/')
+  UDEV_VERSION=$(udevinfo -V | sed -e 's/^[^0-9]* 
\([0-9]\{1,\}\)[^0-9]\{0,\}/\1/')
 
 if [ -n "$UDEV_VERSION" ] && [ $UDEV_VERSION -ge 059 ]; then
   cp -f $src/etc/udev/rules.d/*.rules $dst/etc/udev/rules.d/
diff -r 206731134e18 -r 5ae89ce67486 tools/check/check_hotplug
--- a/tools/check/check_hotplug Fri Nov 25 15:18:26 2005
+++ b/tools/check/check_hotplug Fri Nov 25 15:26:19 2005
@@ -7,7 +7,7 @@
    exit 1
 }
 [ -x "$(which udevinfo)" ] && \
-  UDEV_VERSION=$(udevinfo -V | sed -e 's/^.*\s\([0-9]\+\)[^0-9]*/\1/')
+  UDEV_VERSION=$(udevinfo -V | sed -e 's/^[^0-9]* 
\([0-9]\{1,\}\)[^0-9]\{0,\}/\1/')
 
 if [ -n "$UDEV_VERSION" ] && [ $UDEV_VERSION -ge 059 ]; then
   exit 0

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog