Commits

Albert Hopkins  committed 19803e3

Merged changes.

  • Participants
  • Parent commits fa2c8af
  • Tags 0.3.0

Comments (0)

Files changed (1)

File hemp/helpers.py

         # see if we're being used
         status = sudo_popen(['fuser', '-a', devnode], stderr=NULL).wait()
         if status != 0:
+<<<<<<< local
+            port = dev_num + PORT
+            args = ['qemu-nbd', '-c', devnode, '-P', '1', image]
+            #args = ['qemu-nbd', '-n', '-b', 'localhost', '-p', str(port),
+            #    '-P', '1', image]
+=======
             args = ['qemu-nbd', '--nocache', '--partition=1',
                 '--connect=%s' % devnode, basename]
+>>>>>>> other
 
             sudo_popen(args, stderr=NULL, stdout=NULL, stdin=NULL)
             sleep(WAIT_TIME)