convert over optional policy to optional_policy macro

refpolicy/policy/modules/kernel/bootloader.te

@@ -140,7 +140,7 @@ allow bootloader_t bootloader_tmp_t:lnk_file { create read getattr setattr unlin
 # for tune2fs (cjp: ?)
 files_create_private_root_dir_entry(bootloader_t,bootloader_tmp_t)
 
-ifdef(`fsadm.te', `
+optional_policy(`fsadm.te', `
 filesystemtools_execute(bootloader_t)
 ')
 

refpolicy/policy/modules/system/init.te

@@ -140,22 +140,10 @@ allow init_t self:capability ~sys_module;
 # Modify utmp.
 allow init_t initrc_var_run_t:file { getattr read write setattr };
 
-define(`init_consoletype_optional_policy',`
+optional_policy(`consoletype.te',`
 consoletype_execute(init_t,optional)
 ')
 
-########################################
-#
-# Conditional policy logic
-#
-
-ifdef(`monolithic_policy',`
-ifdef(`consoletype.te',`init_consoletype_optional_policy')
-',`
-optional consoletype { consoletype_execute_depend }
-ifopt (consoletype) { init_consoletype_optional_policy }
-') dnl end monolithic_policy
-
 ########################################
 #
 # the following still need to be converted over

refpolicy/policy/modules/system/logging.te

@@ -153,7 +153,7 @@ kernel_clear_ring_buffer(syslogd_t)
 kernel_change_ring_buffer_level(syslogd_t)
 ')
 
-ifdef(`udev.te', `
+optional_policy(`udev.te', `
 udev_read_database(syslogd_t)
 ')dnl end if udev.te