diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-03-28 23:28:18 +0100 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-03-28 23:39:37 +0100 |
| commit | 6bff21f764461613ce6fb2e5fcb0ed7eef046ac6 (patch) | |
| tree | 41308bd828053036c88c9c2ddad7361031b14ea6 | |
| parent | 546cc5726f1d2c444aaa323243d0f609b014dca4 (diff) | |
| download | draklive-config-6bff21f764461613ce6fb2e5fcb0ed7eef046ac6.tar draklive-config-6bff21f764461613ce6fb2e5fcb0ed7eef046ac6.tar.gz draklive-config-6bff21f764461613ce6fb2e5fcb0ed7eef046ac6.tar.bz2 draklive-config-6bff21f764461613ce6fb2e5fcb0ed7eef046ac6.tar.xz draklive-config-6bff21f764461613ce6fb2e5fcb0ed7eef046ac6.zip | |
Use Xfce instead of xfce4 for the ISO file name and disk label.
This is the name & capitalisation used upstream.
| -rw-r--r-- | config/auto_inst.cfg.pl | 2 | ||||
| -rw-r--r-- | config/live.cfg | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index 7ae502e..81d1071 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -11,7 +11,7 @@ my $distro_config = lc($distro_release); my @desktops = split(/\|/, $ENV{DRAKLIVE_DESKTOP}); my $has_plasma = member('Plasma', @desktops); my $has_gnome = member('GNOME', @desktops); -my $has_xfce = member('xfce4', @desktops); +my $has_xfce = member('Xfce', @desktops); my $has_lxde = member('LXDE', @desktops); my $has_enlightenment = member('Enlightenment', @desktops); diff --git a/config/live.cfg b/config/live.cfg index dff647b..438704d 100644 --- a/config/live.cfg +++ b/config/live.cfg @@ -177,7 +177,7 @@ my $_l = { if_($live->{settings}{default_user}, "echo $live->{settings}{default_user} > /etc/draklive-install.d/user"), "perl -pi -e 's,<DEFAULT_USER>,$live->{settings}{default_user},' /etc/draklive-install.d/sysconfig/finish-install", - if_($live->{settings}{desktop} eq 'xfce4' && $live->{settings}{default_user}, + if_($live->{settings}{desktop} eq 'Xfce' && $live->{settings}{default_user}, # add a desktop icon to run draklive-install "mkdir -p /home/$live->{settings}{default_user}/Desktop", "cp /usr/share/applications/mageia-draklive-install.desktop /home/$live->{settings}{default_user}/Desktop/draklive-install.desktop", |