diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2022-10-31 22:16:33 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2022-10-31 22:16:33 +0000 |
| commit | 2e06caa8f5f035c338ccf784c1b49238a47085f4 (patch) | |
| tree | e990ccc09a7c80b28a5c9c3f4d6617ab2573edf9 /config | |
| parent | ade6ca04b8d44a8f3c3257f81ed4a35b51a832fe (diff) | |
| download | draklive-config-2e06caa8f5f035c338ccf784c1b49238a47085f4.tar draklive-config-2e06caa8f5f035c338ccf784c1b49238a47085f4.tar.gz draklive-config-2e06caa8f5f035c338ccf784c1b49238a47085f4.tar.bz2 draklive-config-2e06caa8f5f035c338ccf784c1b49238a47085f4.tar.xz draklive-config-2e06caa8f5f035c338ccf784c1b49238a47085f4.zip | |
Add Xfce desktop shortcut to draklive-install at run time, not build time.
Xfce has added an extra restriction on executable desktop files in the
Desktop directory. They now need to have a xfce-exe-checksum extended
file attribute as well as having execute permissions. We can't add
this at build time because squashfs does not support system extended
attributes.
Diffstat (limited to 'config')
| -rw-r--r-- | config/build.cfg | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/config/build.cfg b/config/build.cfg index fa60780..ab62c58 100644 --- a/config/build.cfg +++ b/config/build.cfg @@ -269,6 +269,13 @@ my $config = { [ 'files/dolphinrc', '/home/live/.config/dolphinrc', { mode => 0644, no_install => 1 } ], ), + if_($has_xfce, + # Add a desktop shortcut to run draklive-install. This needs to be done during the live session + # startup because Xfce requires the xfce-exe-checksum extended attribute to be set on executable + # files in the Desktop directory, and squashfs doesn't support this attribute. + [ 'files/add-draklive-install-shortcut.desktop', '/etc/xdg/autostart/add-draklive-install-shortcut.desktop', { mode => 0644, no_install => 1 } ], + [ 'files/add-draklive-install-shortcut', '/usr/bin/add-draklive-install-shortcut', { mode => 0755, no_install => 1 } ], + ), ], remove_files => [ (map { "/etc/modprobe.preload.d/$_" } qw(cpufreq pcmcia rfswitch)), @@ -309,13 +316,6 @@ my $config = { "rm -f /usr/share/icons/*/icon-theme.cache", ), - if_($has_xfce, - # Add a desktop icon to run draklive-install. - "mkdir -p /home/$default_user/Desktop", - "cp /usr/share/applications/mageia-draklive-install.desktop /home/$default_user/Desktop/draklive-install.desktop", - "chmod 750 /home/$default_user/Desktop/draklive-install.desktop", - ), - # Switch to NetworkManager. "systemctl -q disable network", "systemctl -q disable network-up", |