Murillo Fernandes Bernardes
2005-Nov-18 02:30 UTC
[Xen-devel] Change check for udev on install.sh and check_hotplug
Changes check for "udev", so that it works on debian sid (that does not have /sbin/udev anymore). Signed-off-by: Murillo F. Bernardes <mfb@br.ibm.com> -- Murillo Fernandes Bernardes _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ewan Mellor
2005-Nov-18 12:56 UTC
Re: [Xen-devel] Change check for udev on install.sh and check_hotplug
On Fri, Nov 18, 2005 at 12:30:49AM -0200, Murillo Fernandes Bernardes wrote:> Changes check for "udev", so that it works on debian sid (that does not > have /sbin/udev anymore). > > Signed-off-by: Murillo F. Bernardes <mfb@br.ibm.com> > > -- > Murillo Fernandes Bernardes> # HG changeset patch > # User root@localhost.localdomain > # Node ID 54911570fae54eda445880eb7bf31926964717dd > # Parent 9bf6f907b3ff0261902f06d261f76c1bd12af9f5 > Changes check for "udev", so that it works on debian (that does not have /sbin/udev anymore). > > Tested on Debian Sid and FC4. > > diff -r 9bf6f907b3ff -r 54911570fae5 install.sh > --- a/install.sh Wed Nov 16 10:29:52 2005 > +++ b/install.sh Wed Nov 16 21:41:26 2005 > @@ -27,7 +27,10 @@ > cp -fdRL $src/etc/init.d/* $dst/etc/init.d/ > echo "All done." > > -if [ -x /sbin/udev ] && [ ! -z `/sbin/udev -V` ] && [ `/sbin/udev -V` -ge 059 ]; then > + > +UDEV_VERSION=$(udevinfo -V | sed -e ''s/^.*\s\([0-9]\+\)[^0-9]*/\1/'') > + > +if [ -x /sbin/udevd ] && [ ! -z $UDEV_VERSION ] && [ $UDEV_VERSION -ge 059 ]; then > cp -f $src/etc/udev/rules.d/*.rules $dst/etc/udev/rules.d/ > else > cp -f $src/etc/hotplug/*.agent $dst/etc/hotplug/ > diff -r 9bf6f907b3ff -r 54911570fae5 tools/check/check_hotplug > --- a/tools/check/check_hotplug Wed Nov 16 10:29:52 2005 > +++ b/tools/check/check_hotplug Wed Nov 16 21:41:26 2005 > @@ -7,7 +7,9 @@ > exit 1 > } > > -if [ -x /sbin/udev ] && [ ! -z `/sbin/udev -V` ] && [ `/sbin/udev -V` -ge 059 ]; then > +UDEV_VERSION=$(udevinfo -V | sed -e ''s/^.*\s\([0-9]\+\)[^0-9]*/\1/'') > + > +if [ -x /sbin/udevd ] && [ ! -z $UDEV_VERSION ] && [ $UDEV_VERSION -ge 059 ]; then > exit 0 > fiIsn''t this going to issue a "udevinfo: command not found" message if udev isn''t installed? It would be better if you checked for the existence of udevinfo before trying to run it. Ewan. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Murillo Fernandes Bernardes
2005-Nov-18 13:54 UTC
Re: [Xen-devel] Change check for udev on install.sh and check_hotplug
On Friday 18 November 2005 10:56, Ewan Mellor wrote:> On Fri, Nov 18, 2005 at 12:30:49AM -0200, Murillo Fernandes Bernardes wrote: > > Changes check for "udev", so that it works on debian sid (that does not > > have /sbin/udev anymore). > > > > Signed-off-by: Murillo F. Bernardes <mfb@br.ibm.com>> Isn''t this going to issue a "udevinfo: command not found" message if udev > isn''t installed? > It would be better if you checked for the existence of > udevinfo before trying to run it.fixed in this patch. Signed-off-by: Murillo F. Bernardes <mfb@br.ibm.com> -- Murillo Fernandes Bernardes _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel