|
 |
1070a0 |
diff -ru cobbler-2.0.7.orig/koan/app.py cobbler-2.0.7/koan/app.py
|
|
|
1070a0 |
--- cobbler-2.0.7.orig/koan/app.py 2013-04-10 10:51:54.775900810 +0200
|
|
|
1070a0 |
+++ cobbler-2.0.7/koan/app.py 2013-04-10 10:52:36.816981814 +0200
|
|
|
1070a0 |
@@ -1491,32 +1491,8 @@
|
|
|
1070a0 |
if lv_create != 0:
|
|
|
1070a0 |
raise InfoException, "LVM creation failed"
|
|
|
1070a0 |
|
|
|
1070a0 |
- # partition location
|
|
|
1070a0 |
- partition_location = "/dev/%s/%s" % (location,name)
|
|
|
1070a0 |
-
|
|
|
1070a0 |
- # check whether we have SELinux enabled system
|
|
|
1070a0 |
- args = "/usr/sbin/selinuxenabled"
|
|
|
1070a0 |
- selinuxenabled = sub_process.call(args)
|
|
|
1070a0 |
- if selinuxenabled == 0:
|
|
|
1070a0 |
- # required context type
|
|
|
1070a0 |
- context_type = "virt_image_t"
|
|
|
1070a0 |
-
|
|
|
1070a0 |
- # change security context type to required one
|
|
|
1070a0 |
- args = "/usr/bin/chcon -t %s %s" % (context_type, partition_location)
|
|
|
1070a0 |
- print "%s" % args
|
|
|
1070a0 |
- change_context = sub_process.call(args, close_fds=True, shell=True)
|
|
|
1070a0 |
-
|
|
|
1070a0 |
- # modify SELinux policy in order to preserve security context
|
|
|
1070a0 |
- # between reboots
|
|
|
1070a0 |
- args = "/usr/sbin/semanage fcontext -a -t %s %s" % (context_type, partition_location)
|
|
|
1070a0 |
- print "%s" % args
|
|
|
1070a0 |
- change_context |= sub_process.call(args, close_fds=True, shell=True)
|
|
|
1070a0 |
-
|
|
|
1070a0 |
- if change_context != 0:
|
|
|
1070a0 |
- raise InfoException, "SELinux security context setting to LVM partition failed"
|
|
|
1070a0 |
-
|
|
|
1070a0 |
# return partition location
|
|
|
1070a0 |
- return partition_location
|
|
|
1070a0 |
+ return "/dev/%s/%s" % (location,name)
|
|
|
1070a0 |
|
|
|
1070a0 |
else:
|
|
|
1070a0 |
raise InfoException, "volume group needs %s GB free space." % virt_size
|