ia64/xen-unstable

changeset 8056:5ae89ce67486

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@mulix.org>
Signed-Off-By: Orna Agmon <ladypine@ladypine.org>
author emellor@leeni.uk.xensource.com
date Fri Nov 25 15:26:19 2005 +0000 (2005-11-25)
parents 206731134e18
children d46553f73c6f
files install.sh tools/check/check_hotplug
line diff
     1.1 --- a/install.sh	Fri Nov 25 15:18:26 2005 +0000
     1.2 +++ b/install.sh	Fri Nov 25 15:26:19 2005 +0000
     1.3 @@ -28,7 +28,7 @@ cp -fdRL $src/etc/init.d/* $dst/etc/init
     1.4  echo "All done."
     1.5  
     1.6  [ -x "$(which udevinfo)" ] && \
     1.7 -  UDEV_VERSION=$(udevinfo -V | sed -e 's/^.*\s\([0-9]\+\)[^0-9]*/\1/')
     1.8 +  UDEV_VERSION=$(udevinfo -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/')
     1.9  
    1.10  if [ -n "$UDEV_VERSION" ] && [ $UDEV_VERSION -ge 059 ]; then
    1.11    cp -f $src/etc/udev/rules.d/*.rules $dst/etc/udev/rules.d/
     2.1 --- a/tools/check/check_hotplug	Fri Nov 25 15:18:26 2005 +0000
     2.2 +++ b/tools/check/check_hotplug	Fri Nov 25 15:26:19 2005 +0000
     2.3 @@ -7,7 +7,7 @@ function error {
     2.4     exit 1
     2.5  }
     2.6  [ -x "$(which udevinfo)" ] && \
     2.7 -  UDEV_VERSION=$(udevinfo -V | sed -e 's/^.*\s\([0-9]\+\)[^0-9]*/\1/')
     2.8 +  UDEV_VERSION=$(udevinfo -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/')
     2.9  
    2.10  if [ -n "$UDEV_VERSION" ] && [ $UDEV_VERSION -ge 059 ]; then
    2.11    exit 0