diff options
| -rw-r--r-- | config/live.cfg | 5 | ||||
| -rwxr-xr-x | files/99dm-reload.xsetup | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/config/live.cfg b/config/live.cfg index 3031e40..ab75407 100644 --- a/config/live.cfg +++ b/config/live.cfg @@ -111,8 +111,9 @@ my $_l = { (map { [ 'files/draksnapshot.sysconfig', $_ . '/.draksnapshot', { mode => 0644, no_install => 1 } ] } @user_config_dirs), [ 'files/compute-ooo-dicts.pl', '/usr/sbin/compute-ooo-dicts.pl', { mode => 0755 } ], [ 'files/compute-i18n-list.pl', '/usr/sbin/compute-i18n-list.pl', { mode => 0755 } ], -# if_($live->{settings}{desktop} eq 'GNOME', -# [ 'files/99dm-reload.xsetup', '/etc/X11/xsetup.d/', { mode => 0755 } ]), + if_($live->{settings}{desktop} eq 'GNOME', + [ 'files/99dm-reload.xsetup', '/etc/X11/xsetup.d/', { mode => 0755 } ] + ), if_($live->{settings}{product} =~ /guadec/i, [ 'files/GUADEC-booklet.desktop', '/usr/share/nautilus/default-desktop/booklet.desktop' ], ), diff --git a/files/99dm-reload.xsetup b/files/99dm-reload.xsetup index f88368a..97b8601 100755 --- a/files/99dm-reload.xsetup +++ b/files/99dm-reload.xsetup @@ -1,3 +1,8 @@ #!/bin/sh -LOCK=/var/lock/reload-dm -[ -f "$LOCK" ] && rm -f $LOCK && if [ x"$RUNNING_UNDER_GDM" = xtrue ]; then /usr/bin/systemctl --no-block restart prefdm.service; fi; +LOCK=/run/lock/reload-dm +if [ -f "$LOCK" ]; then + rm -f $LOCK + if [ x"$RUNNING_UNDER_GDM" = xtrue ]; then + /usr/bin/systemctl --no-block restart display-manager.service + fi +fi |