summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/live.cfg2
-rw-r--r--files/draklive-install.d/remove.d/livecd-halt-local2
2 files changed, 4 insertions, 0 deletions
diff --git a/config/live.cfg b/config/live.cfg
index 8a42e9c..e0cba3e 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -55,6 +55,8 @@ 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
new file mode 100644
index 0000000..323ed6f
--- /dev/null
+++ b/files/draklive-install.d/remove.d/livecd-halt-local
@@ -0,0 +1,2 @@
+/etc/systemd/system/halt-local.service
+/sbin/halt.local