From 1d405b7498321558dd3d8fbac1e3c8c4283be87f Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 1 Nov 2007 09:37:47 +0000 Subject: [PATCH] acm, xend: Follow linked files. Signed-off-by: Stefan Berger --- tools/python/xen/util/xsm/acm/acm.py | 29 ++++++++++------------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/tools/python/xen/util/xsm/acm/acm.py b/tools/python/xen/util/xsm/acm/acm.py index 62a1cd8d73..47e9ce586d 100644 --- a/tools/python/xen/util/xsm/acm/acm.py +++ b/tools/python/xen/util/xsm/acm/acm.py @@ -711,33 +711,24 @@ def unify_resname(resource, mustexist=True): except: err("Resource spec '%s' contains no tap subtype" % resource) - import os - if typ in ["phy", "tap"]: + if typ in ["phy"]: if not resfile.startswith("/"): resfile = "/dev/" + resfile if mustexist: - stats = os.lstat(resfile) - if stat.S_ISLNK(stats[stat.ST_MODE]): - resolved = os.readlink(resfile) - if resolved[0] != "/": - resfile = os.path.join(os.path.dirname(resfile), resolved) - resfile = os.path.abspath(resfile) - else: - resfile = resolved + resfile = os.path.realpath(resfile) + try: stats = os.lstat(resfile) - if not (stat.S_ISBLK(stats[stat.ST_MODE])): + if not (stat.S_ISBLK(stats[stat.ST_MODE])): + err("Invalid resource") + except: err("Invalid resource") if typ in [ "file", "tap" ]: - if mustexist: - stats = os.lstat(resfile) - if stat.S_ISLNK(stats[stat.ST_MODE]): - resfile = os.readlink(resfile) - stats = os.lstat(resfile) - if not stat.S_ISREG(stats[stat.ST_MODE]): - err("Invalid resource") + resfile = os.path.realpath(resfile) + if mustexist and not os.path.isfile(resfile): + err("Invalid resource") - #file: resources must specified with absolute path + #file: resources must be specified with absolute path #vlan resources don't start with '/' if typ != "vlan": if (not resfile.startswith("/")) or \ -- 2.30.2