diff -r f47b924f74af tools/pygrub/src/pygrub --- a/tools/pygrub/src/pygrub Tue Jan 18 12:25:54 2011 +0000 +++ b/tools/pygrub/src/pygrub Thu Jan 20 15:46:33 2011 +0000 @@ -400,7 +400,6 @@ for f,parser in cfg_list: if fs.file_exists(f): - print >>sys.stderr, "Using %s to parse %s" % (parser,f) self.cf = parser() self.cf.filename = f break @@ -687,14 +686,6 @@ else: fd = os.open(output, os.O_WRONLY) - # debug - if isconfig: - chosencfg = run_grub(file, entry, fs, incfg["args"]) - print " kernel: %s" % chosencfg["kernel"] - if chosencfg["ramdisk"]: - print " initrd: %s" % chosencfg["ramdisk"] - print " args: %s" % chosencfg["args"] - sys.exit(0) # if boot filesystem is set then pass to fsimage.open bootfsargs = '"%s"' % incfg["args"] @@ -704,6 +695,19 @@ else: fs = fsimage.open(file, get_fs_offset(file)) + # debug + if isconfig: + chosencfg = run_grub(file, entry, fs, incfg["args"]) + if chosencfg.has_key("kernel"): + print " kernel: %s" % chosencfg["kernel"] + if chosencfg.has_key("ramdisk"): + print " initrd: %s" % chosencfg["ramdisk"] + if chosencfg.has_key("args"): + print " args: %s" % chosencfg["args"] + if not chosencfg: + print " no config" + sys.exit(0) + chosencfg = sniff_solaris(fs, incfg) if not chosencfg["kernel"]: