|
1 | 1 | <def-group>
|
2 |
| - <definition class="compliance" id="dconf_gnome_disable_automount" version="1"> |
| 2 | + <definition class="compliance" id="dconf_gnome_disable_automount" version="2"> |
3 | 3 | {{{ oval_metadata("The system's default desktop environment, GNOME3, will mount
|
4 | 4 | devices and removable media (such as DVDs, CDs and USB flash drives)
|
5 | 5 | whenever they are inserted into the system. Disable automount and autorun
|
6 | 6 | within GNOME3.") }}}
|
7 | 7 | <criteria operator="OR">
|
8 | 8 | <extend_definition comment="dconf installed" definition_ref="package_dconf_installed" negate="true" />
|
9 |
| - <criteria comment="Disable GNOME3 automount/autorun and prevent user from changing it" operator="AND"> |
| 9 | + <criteria comment="Disable GNOME3 automount and prevent user from changing it" operator="AND"> |
10 | 10 | <extend_definition comment="dconf user profile exists" definition_ref="enable_dconf_user_profile" />
|
11 | 11 | <criterion comment="Disable automount in GNOME3" test_ref="test_dconf_gnome_disable_automount" />
|
12 |
| - <criterion comment="Disable automount-open in GNOME3" test_ref="test_dconf_gnome_disable_automount_open" /> |
13 |
| - <criterion comment="Disable autorun in GNOME3" test_ref="test_dconf_gnome_disable_autorun" /> |
14 | 12 | <criterion comment="Prevent user from changing automount setting" test_ref="test_prevent_user_gnome_automount" />
|
15 |
| - <criterion comment="Prevent user from changing automount-open setting" test_ref="test_prevent_user_gnome_automount_open" /> |
16 |
| - <criterion comment="Prevent user from changing autorun setting" test_ref="test_prevent_user_gnome_autorun" /> |
17 | 13 | </criteria>
|
18 | 14 | </criteria>
|
19 | 15 | </definition>
|
|
43 | 39 | <ind:pattern operation="pattern match">^/org/gnome/desktop/media-handling/automount$</ind:pattern>
|
44 | 40 | <ind:instance datatype="int">1</ind:instance>
|
45 | 41 | </ind:textfilecontent54_object>
|
46 |
| - |
47 |
| - <ind:textfilecontent54_test check="all" check_existence="all_exist" |
48 |
| - comment="Disable automount-open in GNOME" |
49 |
| - id="test_dconf_gnome_disable_automount_open" version="1"> |
50 |
| - <ind:object object_ref="obj_dconf_gnome_disable_automount_open" /> |
51 |
| - </ind:textfilecontent54_test> |
52 |
| - <ind:textfilecontent54_object id="obj_dconf_gnome_disable_automount_open" |
53 |
| - version="1"> |
54 |
| - <ind:path>/etc/dconf/db/local.d/</ind:path> |
55 |
| - <ind:filename operation="pattern match">^.*$</ind:filename> |
56 |
| - <ind:pattern operation="pattern match">^\[org/gnome/desktop/media-handling]([^\n]*\n+)+?automount-open=false$</ind:pattern> |
57 |
| - <ind:instance datatype="int">1</ind:instance> |
58 |
| - </ind:textfilecontent54_object> |
59 |
| - |
60 |
| - <ind:textfilecontent54_test check="all" check_existence="all_exist" |
61 |
| - comment="Prevent user from changing automount-open setting" |
62 |
| - id="test_prevent_user_gnome_automount_open" version="1"> |
63 |
| - <ind:object object_ref="obj_prevent_user_gnome_automount_open" /> |
64 |
| - </ind:textfilecontent54_test> |
65 |
| - <ind:textfilecontent54_object id="obj_prevent_user_gnome_automount_open" |
66 |
| - version="1"> |
67 |
| - <ind:path>/etc/dconf/db/local.d/locks/</ind:path> |
68 |
| - <ind:filename operation="pattern match">^.*$</ind:filename> |
69 |
| - <ind:pattern operation="pattern match">^/org/gnome/desktop/media-handling/automount-open$</ind:pattern> |
70 |
| - <ind:instance datatype="int">1</ind:instance> |
71 |
| - </ind:textfilecontent54_object> |
72 |
| - |
73 |
| - <ind:textfilecontent54_test check="all" check_existence="all_exist" |
74 |
| - comment="Disable autorun in GNOME" |
75 |
| - id="test_dconf_gnome_disable_autorun" version="1"> |
76 |
| - <ind:object object_ref="obj_dconf_gnome_disable_autorun" /> |
77 |
| - </ind:textfilecontent54_test> |
78 |
| - <ind:textfilecontent54_object id="obj_dconf_gnome_disable_autorun" |
79 |
| - version="1"> |
80 |
| - <ind:path>/etc/dconf/db/local.d/</ind:path> |
81 |
| - <ind:filename operation="pattern match">^.*$</ind:filename> |
82 |
| - <ind:pattern operation="pattern match">^\[org/gnome/desktop/media-handling]([^\n]*\n+)+?autorun-never=true$</ind:pattern> |
83 |
| - <ind:instance datatype="int">1</ind:instance> |
84 |
| - </ind:textfilecontent54_object> |
85 |
| - |
86 |
| - <ind:textfilecontent54_test check="all" check_existence="all_exist" |
87 |
| - comment="Prevent user from changing autorun setting" |
88 |
| - id="test_prevent_user_gnome_autorun" version="1"> |
89 |
| - <ind:object object_ref="obj_prevent_user_gnome_autorun" /> |
90 |
| - </ind:textfilecontent54_test> |
91 |
| - <ind:textfilecontent54_object id="obj_prevent_user_gnome_autorun" |
92 |
| - version="1"> |
93 |
| - <ind:path>/etc/dconf/db/local.d/locks/</ind:path> |
94 |
| - <ind:filename operation="pattern match">^.*$</ind:filename> |
95 |
| - <ind:pattern operation="pattern match">^/org/gnome/desktop/media-handling/autorun-never$</ind:pattern> |
96 |
| - <ind:instance datatype="int">1</ind:instance> |
97 |
| - </ind:textfilecontent54_object> |
98 | 42 | </def-group>
|
0 commit comments