summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/live.cfg7
-rw-r--r--files/draklive-install.d/remove.d/livecd-halt-local2
2 files changed, 3 insertions, 6 deletions
diff --git a/config/live.cfg b/config/live.cfg
index 8b16689..ea8dc05 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -44,8 +44,8 @@ my $_l = {
[ 'files/defaultspooler', '/etc/foomatic/defaultspooler', { mode => 0644 } ],
if_($live->{settings}{media} eq 'CD',
#- eject eject cd medium before halt/reboot
- [ 'files/halt-local.service', '/etc/systemd/system/halt-local.service', { mode => 0644 } ],
- [ 'files/halt.local.CD', '/sbin/halt.local', { mode => 0755 } ],
+ [ 'files/halt-local.service', '/etc/systemd/system/halt-local.service', { mode => 0644, no_install => 1 } ],
+ [ 'files/halt.local.CD', '/sbin/halt.local', { mode => 0755, no_install => 1 } ],
#- do not load usblp and trigger autosetupprintqueues in live since cups is not available
[ 'files/live.modprobe.CD', '/etc/modprobe.d/live.conf', { mode => 0644, no_install => 1 } ],
),
@@ -55,8 +55,7 @@ my $_l = {
[ "files/finish-install.$live->{settings}{media}", '/etc/sysconfig/finish-install', { mode => 0644 } ],
#- disable speedboot for first boot after disk installation
[ 'files/draklive-install.d/remove.d/disable-speedboot', '/etc/draklive-install.d/remove.d/disable-speedboot', { mode => 0644 } ],
- # remove the livecd specific halt.local code
- [ 'files/draklive-install.d/remove.d/livecd-halt-local', '/etc/draklive-install.d/remove.d/livecd-halt-local', { mode => 0644 } ],
+
if_($live->{settings}{desktop} eq 'KDE4',
[ 'files/draklive-install.d/run.d/generate-gtk-icon-cache.sh', '/etc/draklive-install.d/run.d/generate-gtk-icon-cache.sh', { mode => 755 } ]),
#- sysconfig files for first boot
diff --git a/files/draklive-install.d/remove.d/livecd-halt-local b/files/draklive-install.d/remove.d/livecd-halt-local
deleted file mode 100644
index 323ed6f..0000000
--- a/files/draklive-install.d/remove.d/livecd-halt-local
+++ /dev/null
@@ -1,2 +0,0 @@
-/etc/systemd/system/halt-local.service
-/sbin/halt.local