Skip to content

Commit ef4c148

Browse files
teacup-on-rockingchairteacup-on-rockingchair
committed
Revert usage of dconf_gdm_dir variable in ubuntu
1 parent f7184bd commit ef4c148

File tree

77 files changed

+398
-51
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+398
-51
lines changed

‎linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/ansible/shared.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
# disruption = medium
66
- name: "Disable GNOME3 Automounting - automount"
77
community.general.ini_file:
8+
{{% if product in ['sle15', 'sle16'] %}}
89
dest: /etc/dconf/db/{{{ dconf_gdm_dir }}}/00-security-settings
10+
{{% else %}}
11+
dest: /etc/dconf/db/local.d/00-security-settings
12+
{{% endif %}}
913
section: org/gnome/desktop/media-handling
1014
option: automount
1115
value: "false"
@@ -15,7 +19,11 @@
1519

1620
- name: "Prevent user modification of GNOME3 Automounting - automount"
1721
ansible.builtin.lineinfile:
18-
path: /etc/dconf/db/{{{ dconf_gdm_dir }}}/locks/00-security-settings
22+
{{% if product in ['sle15', 'sle16'] %}}
23+
path: /etc/dconf/db/{{{ dconf_gdm_dir }}}/locks/00-security-settings-lock
24+
{{% else %}}
25+
path: /etc/dconf/db/local.d/locks/00-security-settings-lock
26+
{{% endif %}}
1927
regexp: '^/org/gnome/desktop/media-handling/automount$'
2028
line: '/org/gnome/desktop/media-handling/automount'
2129
create: yes

‎linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/bash/shared.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
# apply fix for enable_dconf_user_profile, OVAL checks it
99
{{% if product in ['sle15', 'sle16'] %}}
1010
{{{ bash_enable_dconf_user_profile(profile="gdm", database="gdm") }}}
11-
{{% endif %}}
12-
1311
{{{ bash_dconf_settings("org/gnome/desktop/media-handling", "automount", "false", dconf_gdm_dir, "00-security-settings", rule_id=rule_id) }}}
1412
{{{ bash_dconf_lock("org/gnome/desktop/media-handling", "automount", dconf_gdm_dir, "00-security-settings-lock") }}}
13+
{{% else %}}
14+
{{{ bash_dconf_settings("org/gnome/desktop/media-handling", "automount", "false", "local.d", "00-security-settings", rule_id=rule_id) }}}
15+
{{{ bash_dconf_lock("org/gnome/desktop/media-handling", "automount", "local.d", "00-security-settings-lock") }}}
16+
{{% endif %}}

‎linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/oval/shared.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@
2020
</ind:textfilecontent54_test>
2121
<ind:textfilecontent54_object id="obj_dconf_gnome_disable_automount"
2222
version="1">
23+
{{% if product in ['sle15', 'sle16'] %}}
2324
<ind:path>/etc/dconf/db/{{{ dconf_gdm_dir }}}/</ind:path>
25+
{{% else %}}
26+
<ind:path>/etc/dconf/db/local.d/</ind:path>
27+
{{% endif %}}
2428
<ind:filename operation="pattern match">^.*$</ind:filename>
2529
<ind:pattern operation="pattern match">^\[org/gnome/desktop/media-handling\]([^\n]*\n+)+?automount=false$</ind:pattern>
2630
<ind:instance datatype="int">1</ind:instance>
@@ -33,7 +37,11 @@
3337
</ind:textfilecontent54_test>
3438
<ind:textfilecontent54_object id="obj_prevent_user_gnome_automount"
3539
version="1">
40+
{{% if product in ['sle15', 'sle16'] %}}
3641
<ind:path>/etc/dconf/db/{{{ dconf_gdm_dir }}}/locks/</ind:path>
42+
{{% else %}}
43+
<ind:path>/etc/dconf/db/local.d/locks/</ind:path>
44+
{{% endif %}}
3745
<ind:filename operation="pattern match">^.*$</ind:filename>
3846
<ind:pattern operation="pattern match">^/org/gnome/desktop/media-handling/automount$</ind:pattern>
3947
<ind:instance datatype="int">1</ind:instance>

‎linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/tests/correct_value.pass.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,10 @@ install_dconf_and_gdm_if_needed
88
clean_dconf_settings
99

1010
add_dconf_profiles
11+
{{% if product in ['sle15', 'sle16'] %}}
1112
add_dconf_setting "org/gnome/desktop/media-handling" "automount" "false" "{{{ dconf_gdm_dir }}}" "00-security-settings"
1213
add_dconf_lock "org/gnome/desktop/media-handling" "automount" "{{{ dconf_gdm_dir }}}" "00-security-settings"
14+
{{% else %}}
15+
add_dconf_setting "org/gnome/desktop/media-handling" "automount" "false" "local.d" "00-security-settings"
16+
add_dconf_lock "org/gnome/desktop/media-handling" "automount" "local.d" "00-security-settings"
17+
{{% endif %}}

‎linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/tests/missing_profiles.fail.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,10 @@
88
install_dconf_and_gdm_if_needed
99
clean_dconf_settings
1010

11+
{{% if product in ['sle15', 'sle16'] %}}
1112
add_dconf_setting "org/gnome/desktop/media-handling" "automount" "false" "{{{ dconf_gdm_dir }}}" "00-security-settings"
1213
add_dconf_lock "org/gnome/desktop/media-handling" "automount" "{{{ dconf_gdm_dir }}}" "00-security-settings"
14+
{{% else %}}
15+
add_dconf_setting "org/gnome/desktop/media-handling" "automount" "false" "local.d" "00-security-settings"
16+
add_dconf_lock "org/gnome/desktop/media-handling" "automount" "local.d" "00-security-settings"
17+
{{% endif %}}

‎linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount/tests/wrong_value.fail.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,10 @@ install_dconf_and_gdm_if_needed
77
clean_dconf_settings
88

99
add_dconf_profiles
10+
{{% if product in ['sle15', 'sle16'] %}}
1011
add_dconf_setting "org/gnome/desktop/media-handling" "automount-open" "false" "{{{ dconf_gdm_dir }}}" "00-security-settings"
1112
add_dconf_lock "org/gnome/desktop/media-handling" "automount-open" "{{{ dconf_gdm_dir }}}" "00-security-settings"
13+
{{% else %}}
14+
add_dconf_setting "org/gnome/desktop/media-handling" "automount-open" "false" "local.d" "00-security-settings"
15+
add_dconf_lock "org/gnome/desktop/media-handling" "automount-open" "local.d" "00-security-settings"
16+
{{% endif %}}

‎linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/ansible/shared.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
# disruption = medium
66
- name: "Disable GNOME3 Automounting - automount-open"
77
community.general.ini_file:
8+
{{% if product in ['sle15', 'sle16'] %}}
89
dest: /etc/dconf/db/{{{ dconf_gdm_dir }}}/00-security-settings
10+
{{% else %}}
11+
dest: /etc/dconf/db/local.d/00-security-settings
12+
{{% endif %}}
913
section: org/gnome/desktop/media-handling
1014
option: automount-open
1115
value: "false"
@@ -15,7 +19,11 @@
1519

1620
- name: "Prevent user modification of GNOME3 Automounting - automount-open"
1721
ansible.builtin.lineinfile:
22+
{{% if product in ['sle15', 'sle16'] %}}
1823
path: /etc/dconf/db/{{{ dconf_gdm_dir }}}/locks/00-security-settings-lock
24+
{{% else %}}
25+
path: /etc/dconf/db/local.d/locks/00-security-settings-lock
26+
{{% endif %}}
1927
regexp: '^/org/gnome/desktop/media-handling/automount-open$'
2028
line: '/org/gnome/desktop/media-handling/automount-open'
2129
create: yes

‎linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/bash/shared.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
# apply fix for enable_dconf_user_profile, OVAL checks it
99
{{% if product in ['sle15', 'sle16'] %}}
1010
{{{ bash_enable_dconf_user_profile(profile="gdm", database="gdm") }}}
11-
{{% endif %}}
12-
1311
{{{ bash_dconf_settings("org/gnome/desktop/media-handling", "automount-open", "false", dconf_gdm_dir , "00-security-settings", rule_id=rule_id) }}}
1412
{{{ bash_dconf_lock("org/gnome/desktop/media-handling", "automount-open", dconf_gdm_dir, "00-security-settings-lock") }}}
13+
{{% else %}}
14+
{{{ bash_dconf_settings("org/gnome/desktop/media-handling", "automount-open", "false", "local.d", "00-security-settings", rule_id=rule_id) }}}
15+
{{{ bash_dconf_lock("org/gnome/desktop/media-handling", "automount-open", "local.d", "00-security-settings-lock") }}}
16+
{{% endif %}}

‎linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/oval/shared.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@
2020
</ind:textfilecontent54_test>
2121
<ind:textfilecontent54_object id="obj_dconf_gnome_disable_automount_open"
2222
version="1">
23+
{{% if product in ['sle15', 'sle16'] %}}
2324
<ind:path>/etc/dconf/db/{{{ dconf_gdm_dir }}}/</ind:path>
25+
{{% else %}}
26+
<ind:path>/etc/dconf/db/local.d/</ind:path>
27+
{{% endif %}}
2428
<ind:filename operation="pattern match">^.*$</ind:filename>
2529
<ind:pattern operation="pattern match">^\[org/gnome/desktop/media-handling\]([^\n]*\n+)+?automount-open=false$</ind:pattern>
2630
<ind:instance datatype="int">1</ind:instance>
@@ -33,7 +37,11 @@
3337
</ind:textfilecontent54_test>
3438
<ind:textfilecontent54_object id="obj_prevent_user_gnome_automount_open"
3539
version="1">
40+
{{% if product in ['sle15', 'sle16'] %}}
3641
<ind:path>/etc/dconf/db/{{{ dconf_gdm_dir }}}/locks/</ind:path>
42+
{{% else %}}
43+
<ind:path>/etc/dconf/db/local.d/locks/</ind:path>
44+
{{% endif %}}
3745
<ind:filename operation="pattern match">^.*$</ind:filename>
3846
<ind:pattern operation="pattern match">^/org/gnome/desktop/media-handling/automount-open$</ind:pattern>
3947
<ind:instance datatype="int">1</ind:instance>

‎linux_os/guide/system/software/gnome/gnome_media_settings/dconf_gnome_disable_automount_open/tests/correct_value.pass.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,10 @@ install_dconf_and_gdm_if_needed
88
clean_dconf_settings
99

1010
add_dconf_profiles
11+
{{% if product in ['sle15', 'sle16'] %}}
1112
add_dconf_setting "org/gnome/desktop/media-handling" "automount-open" "false" "{{{ dconf_gdm_dir }}}" "00-security-settings"
1213
add_dconf_lock "org/gnome/desktop/media-handling" "automount-open" "{{{ dconf_gdm_dir }}}" "00-security-settings"
14+
{{% else %}}
15+
add_dconf_setting "org/gnome/desktop/media-handling" "automount-open" "false" "local.d" "00-security-settings"
16+
add_dconf_lock "org/gnome/desktop/media-handling" "automount-open" "local.d" "00-security-settings"
17+
{{% endif %}}

0 commit comments

Comments
 (0)