From 800ef4b1c55673b682b6ed4787bbeeab9991289d Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Tue, 23 Oct 2018 20:37:33 +0100 Subject: examples: remove halt-local service - it doesn't work. --- examples/gui/config/build.cfg | 4 ---- examples/gui/files/halt-local.service | 23 ----------------------- examples/gui/files/halt.local | 24 ------------------------ examples/minimal/config/build.cfg | 4 ---- examples/minimal/files/halt-local.service | 23 ----------------------- examples/minimal/files/halt.local | 24 ------------------------ examples/xfce/config/build.cfg | 4 ---- examples/xfce/files/halt-local.service | 23 ----------------------- examples/xfce/files/halt.local | 24 ------------------------ 9 files changed, 153 deletions(-) delete mode 100644 examples/gui/files/halt-local.service delete mode 100755 examples/gui/files/halt.local delete mode 100644 examples/minimal/files/halt-local.service delete mode 100755 examples/minimal/files/halt.local delete mode 100644 examples/xfce/files/halt-local.service delete mode 100755 examples/xfce/files/halt.local diff --git a/examples/gui/config/build.cfg b/examples/gui/config/build.cfg index 3948478..ef691ba 100644 --- a/examples/gui/config/build.cfg +++ b/examples/gui/config/build.cfg @@ -112,10 +112,6 @@ my $config = { # Disable suspend and hibernate in live mode. [ 'files/50-disable-suspend.pkla', '/etc/polkit-1/localauthority/50-local.d/50-disable-suspend.pkla', { mode => 0644, no_install => 1 } ], - # Eject medium before live system halt/reboot. - [ 'files/halt-local.service', '/etc/systemd/system/halt-local.service', { mode => 0644, no_install => 1 } ], - [ 'files/halt.local', '/sbin/halt.local', { mode => 0755, no_install => 1 } ], - # sysconfig files for first boot after install. [ 'files/draklive-install.d/finish-install', '/etc/draklive-install.d/sysconfig/finish-install', { mode => 0644 } ], [ 'files/draklive-install.d/firstboot', '/etc/draklive-install.d/sysconfig/firstboot', { mode => 0644 } ], diff --git a/examples/gui/files/halt-local.service b/examples/gui/files/halt-local.service deleted file mode 100644 index bc7f284..0000000 --- a/examples/gui/files/halt-local.service +++ /dev/null @@ -1,23 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. - -[Unit] -Description=/sbin/halt.local Compatibility -ConditionFileIsExecutable=/sbin/halt.local -DefaultDependencies=no -After=shutdown.target -Before=final.target - -[Service] -Type=oneshot -ExecStartPre=-/bin/kill -54 1 -ExecStartPre=-/usr/bin/plymouth quit -ExecStartPre=-/usr/bin/chvt 1 -ExecStart=/sbin/halt.local -TimeoutSec=0 -StandardOutput=tty -RemainAfterExit=yes diff --git a/examples/gui/files/halt.local b/examples/gui/files/halt.local deleted file mode 100755 index e27ad1d..0000000 --- a/examples/gui/files/halt.local +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/perl - -use lib qw(/usr/lib/libDrakX); -use MDK::Common; -use detect_devices; -use c; - -my ($device) = cat_("/proc/mounts") =~ m!(/dev/\S+)\s+/live/media\s+iso9660!; -$device or exit; - -# try to put halt/reboot in cache, if not called directly from them -# mount is also needed by end of /etc/init.d/halt -system("$_ --help &>/dev/null") foreach qw(halt mount reboot); - -my $f = detect_devices::tryOpen($device); -# see openCdromTray() from install::any -ioctl($f, c::CDROM_LOCKDOOR(), 0); # unlock door -ioctl($f, c::CDROMEJECT(), 0); - -system("clear"); -print "\n\n\nPlease press (or ) once the medium is removed.\n"; -system("read < /dev/console"); - -ioctl($f, c::CDROMCLOSETRAY(), 0); diff --git a/examples/minimal/config/build.cfg b/examples/minimal/config/build.cfg index 089467e..21ac42f 100644 --- a/examples/minimal/config/build.cfg +++ b/examples/minimal/config/build.cfg @@ -117,10 +117,6 @@ my $config = { # Disable suspend and hibernate in live mode. [ 'files/50-disable-suspend.pkla', '/etc/polkit-1/localauthority/50-local.d/50-disable-suspend.pkla', { mode => 0644, no_install => 1 } ], - - # Eject medium before live system halt/reboot. - [ 'files/halt-local.service', '/etc/systemd/system/halt-local.service', { mode => 0644, no_install => 1 } ], - [ 'files/halt.local', '/sbin/halt.local', { mode => 0755, no_install => 1 } ], ], remove_files => [ (map { "/etc/modprobe.preload.d/$_" } qw(cpufreq pcmcia rfswitch)), diff --git a/examples/minimal/files/halt-local.service b/examples/minimal/files/halt-local.service deleted file mode 100644 index bc7f284..0000000 --- a/examples/minimal/files/halt-local.service +++ /dev/null @@ -1,23 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. - -[Unit] -Description=/sbin/halt.local Compatibility -ConditionFileIsExecutable=/sbin/halt.local -DefaultDependencies=no -After=shutdown.target -Before=final.target - -[Service] -Type=oneshot -ExecStartPre=-/bin/kill -54 1 -ExecStartPre=-/usr/bin/plymouth quit -ExecStartPre=-/usr/bin/chvt 1 -ExecStart=/sbin/halt.local -TimeoutSec=0 -StandardOutput=tty -RemainAfterExit=yes diff --git a/examples/minimal/files/halt.local b/examples/minimal/files/halt.local deleted file mode 100755 index e27ad1d..0000000 --- a/examples/minimal/files/halt.local +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/perl - -use lib qw(/usr/lib/libDrakX); -use MDK::Common; -use detect_devices; -use c; - -my ($device) = cat_("/proc/mounts") =~ m!(/dev/\S+)\s+/live/media\s+iso9660!; -$device or exit; - -# try to put halt/reboot in cache, if not called directly from them -# mount is also needed by end of /etc/init.d/halt -system("$_ --help &>/dev/null") foreach qw(halt mount reboot); - -my $f = detect_devices::tryOpen($device); -# see openCdromTray() from install::any -ioctl($f, c::CDROM_LOCKDOOR(), 0); # unlock door -ioctl($f, c::CDROMEJECT(), 0); - -system("clear"); -print "\n\n\nPlease press (or ) once the medium is removed.\n"; -system("read < /dev/console"); - -ioctl($f, c::CDROMCLOSETRAY(), 0); diff --git a/examples/xfce/config/build.cfg b/examples/xfce/config/build.cfg index db9b6d9..95d5c12 100644 --- a/examples/xfce/config/build.cfg +++ b/examples/xfce/config/build.cfg @@ -161,10 +161,6 @@ my $config = { # Disable suspend and hibernate in live mode. [ 'files/50-disable-suspend.pkla', '/etc/polkit-1/localauthority/50-local.d/50-disable-suspend.pkla', { mode => 0644, no_install => 1 } ], - # Eject medium before live system halt/reboot. - [ 'files/halt-local.service', '/etc/systemd/system/halt-local.service', { mode => 0644, no_install => 1 } ], - [ 'files/halt.local', '/sbin/halt.local', { mode => 0755, no_install => 1 } ], - # sysconfig files for first boot after install. [ 'files/draklive-install.d/finish-install', '/etc/draklive-install.d/sysconfig/finish-install', { mode => 0644 } ], [ 'files/draklive-install.d/firstboot', '/etc/draklive-install.d/sysconfig/firstboot', { mode => 0644 } ], diff --git a/examples/xfce/files/halt-local.service b/examples/xfce/files/halt-local.service deleted file mode 100644 index bc7f284..0000000 --- a/examples/xfce/files/halt-local.service +++ /dev/null @@ -1,23 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. - -[Unit] -Description=/sbin/halt.local Compatibility -ConditionFileIsExecutable=/sbin/halt.local -DefaultDependencies=no -After=shutdown.target -Before=final.target - -[Service] -Type=oneshot -ExecStartPre=-/bin/kill -54 1 -ExecStartPre=-/usr/bin/plymouth quit -ExecStartPre=-/usr/bin/chvt 1 -ExecStart=/sbin/halt.local -TimeoutSec=0 -StandardOutput=tty -RemainAfterExit=yes diff --git a/examples/xfce/files/halt.local b/examples/xfce/files/halt.local deleted file mode 100755 index e27ad1d..0000000 --- a/examples/xfce/files/halt.local +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/perl - -use lib qw(/usr/lib/libDrakX); -use MDK::Common; -use detect_devices; -use c; - -my ($device) = cat_("/proc/mounts") =~ m!(/dev/\S+)\s+/live/media\s+iso9660!; -$device or exit; - -# try to put halt/reboot in cache, if not called directly from them -# mount is also needed by end of /etc/init.d/halt -system("$_ --help &>/dev/null") foreach qw(halt mount reboot); - -my $f = detect_devices::tryOpen($device); -# see openCdromTray() from install::any -ioctl($f, c::CDROM_LOCKDOOR(), 0); # unlock door -ioctl($f, c::CDROMEJECT(), 0); - -system("clear"); -print "\n\n\nPlease press (or ) once the medium is removed.\n"; -system("read < /dev/console"); - -ioctl($f, c::CDROMCLOSETRAY(), 0); -- cgit v1.2.1