summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2012-05-04 17:42:49 +0000
committerThomas Backlund <tmb@mageia.org>2012-05-04 17:42:49 +0000
commit7244c022e352065ccf05ae7e2e3c4e455f313fb5 (patch)
tree5e146c141636c6d1c3eada42873a44b8f89463c2
parent007f07456f49f43a31c3f5c2f4c4eeffbc18a74d (diff)
downloaddraklive-config-7244c022e352065ccf05ae7e2e3c4e455f313fb5.tar
draklive-config-7244c022e352065ccf05ae7e2e3c4e455f313fb5.tar.gz
draklive-config-7244c022e352065ccf05ae7e2e3c4e455f313fb5.tar.bz2
draklive-config-7244c022e352065ccf05ae7e2e3c4e455f313fb5.tar.xz
draklive-config-7244c022e352065ccf05ae7e2e3c4e455f313fb5.zip
remove livecd mode special halt.local on installed system
-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