rpathsync / grubtobootman / changeset / 97cc68f66ac9

+#
 # Usage:
+#
-# grubtobootman /boot/grub
+# grubtobootman /boot/grub /etc/bootloader.d
+#
 import os
@@ -187,10 +187,12 @@ def emit_kernel_params(kparam, where):
     return nparam
 def usage():
-    print >>sys.stderr, 'usage: %s <path to grub install>' % sys.argv[0]
+    print >>sys.stderr, \
         'usage: %s <path to grub install> <path to bootman includes>' \
         % sys.argv[0]
     sys.exit(1)
-if len(sys.argv) != 2:
+if len(sys.argv) != 3:
     usage()
+#
@@ -209,11 +211,17 @@ bootloader_d_xen_options_p = []
 bootloader_d_xen_options_a = []
 bootloader_d_ro = -1
-for filename in os.listdir('/etc/bootloader.d'):
+try:
     filenames = os.listdir(sys.argv[2])
 except:
     filenames = ()
     print >>sys.stderr, 'exception while reading directory "%s"' % sys.argv[2]
 for filename in filenames:
     # Only process *.conf
     if re_conf.match(filename) == None:
         continue
-    ffilename = os.path.join('/etc/bootloader.d',filename)
+    ffilename = os.path.join(sys.argv[2],filename)
     try:
         f = open(ffilename, "r")
         for line in f:
@@ -340,7 +348,7 @@ f.close()
+#
 print '# Converted from grub.conf by grubtobootman'
 print ''
-print "include '/etc/bootloader.d/*'"
+print "include '%s/*'" % sys.argv[1]
+#
 # Deal with known global parameters