|
Lines 164-170
def mount( options ):
|
Link Here
|
|---|
|
|---|
| 164 |
if options.mount: |
164 |
if options.mount: |
| 165 |
print "Mounting %s ..." % options.mount_point, |
165 |
print "Mounting %s ..." % options.mount_point, |
| 166 |
devnull = open( os.path.devnull, 'w' ) |
166 |
devnull = open( os.path.devnull, 'w' ) |
| 167 |
ret = subprocess.call( [ 'mount', options.mount_point ], stdout = devnull, stderr = subprocess.STDOUT ) |
167 |
if options.iso: |
|
|
168 |
ret = subprocess.call(['mount', '-o', 'loop,ro', options.iso, options.mount_point], stdout=devnull, stderr=subprocess.STDOUT) |
| 169 |
else: |
| 170 |
ret = subprocess.call(['mount', '-o', 'ro', options.mount_point], stdout=devnull, stderr=subprocess.STDOUT) |
| 168 |
# if exit code is 0 or 32 (already mounted) |
171 |
# if exit code is 0 or 32 (already mounted) |
| 169 |
devnull.close() |
172 |
devnull.close() |
| 170 |
if not ret or ret == 32: |
173 |
if not ret or ret == 32: |
|
Lines 220-230
if __name__ == '__main__':
|
Link Here
|
|---|
|
|---|
| 220 |
parser.add_option( '-m', '--mount-point', action = 'store', |
223 |
parser.add_option( '-m', '--mount-point', action = 'store', |
| 221 |
dest = 'mount_point', default = '/cdrom', |
224 |
dest = 'mount_point', default = '/cdrom', |
| 222 |
help = 'devices mount point for CD-ROM drive' ) |
225 |
help = 'devices mount point for CD-ROM drive' ) |
|
|
226 |
parser.add_option('-i', '--iso', action='store', dest='iso', |
| 227 |
default=None, help='define filename of an ISO image') |
| 223 |
|
228 |
|
| 224 |
( options, arguments ) = parser.parse_args() |
229 |
( options, arguments ) = parser.parse_args() |
| 225 |
|
230 |
|
| 226 |
if options.silent: |
231 |
if options.silent: |
| 227 |
sys.stdout = open( '/dev/null', 'w' ) |
232 |
sys.stdout = open(os.path.devnull, 'w') |
| 228 |
|
233 |
|
| 229 |
try: |
234 |
try: |
| 230 |
lock = univention.updater.tools.updater_lock_acquire() |
235 |
lock = univention.updater.tools.updater_lock_acquire() |