diff options
| author |   Henry Gebhardt <hsggebhardt@gmail.com> | 2014-01-18 13:22:03 -0500 |
|---|---|---|
| committer | Henry Gebhardt <hsggebhardt@gmail.com> | 2014-01-18 13:22:03 -0500 |
| commit | 0a74b6aa3f0ee1129ea6789403a238a08abad603 (patch) | |
| tree | 244c8b9ed3fecedce4971ff765334a2ca390da6a | |
| parent | sys-apps/systemd-units-21: remove vsftpd@, mysqld, tmpfiles.d are all gone (diff) | |
| download | systemd-0a74b6aa3f0ee1129ea6789403a238a08abad603.tar.gz systemd-0a74b6aa3f0ee1129ea6789403a238a08abad603.tar.bz2 systemd-0a74b6aa3f0ee1129ea6789403a238a08abad603.zip | |
sys-apps/systemd-units-22: kexec is upstream
| -rw-r--r-- | sys-apps/systemd-units/files/90_kexec | 12 | ||||
| -rw-r--r-- | sys-apps/systemd-units/files/services-server/kexec-load_at.service | 12 | ||||
| -rw-r--r-- | sys-apps/systemd-units/systemd-units-22.ebuild (renamed from sys-apps/systemd-units/systemd-units-21.ebuild) | 18 |
3 files changed, 1 insertions, 41 deletions
diff --git a/sys-apps/systemd-units/files/90_kexec b/sys-apps/systemd-units/files/90_kexec deleted file mode 100644 index 19a7b5c..0000000 --- a/sys-apps/systemd-units/files/90_kexec +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -version="$1" ; shift -image="$1" ; shift - -for s in `systemctl show kexec.target | sed -nre 's/^Wants=(.*)/\1/p'` ; do - case "${s}" in - kexec-load@*) systemctl disable "${s}" ;; - esac -done - -exec systemctl enable kexec-load@"${version}" diff --git a/sys-apps/systemd-units/files/services-server/kexec-load_at.service b/sys-apps/systemd-units/files/services-server/kexec-load_at.service deleted file mode 100644 index e75e594..0000000 --- a/sys-apps/systemd-units/files/services-server/kexec-load_at.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=load %i kernel into the current kernel -Documentation=man:kexec(8) -DefaultDependencies=no -Before=shutdown.target umount.target final.target - -[Service] -Type=oneshot -ExecStart=/usr/sbin/kexec -l /boot/vmlinuz-%i --initrd=/boot/initramfs-%i.img --reuse-cmdline - -[Install] -WantedBy=kexec.target diff --git a/sys-apps/systemd-units/systemd-units-21.ebuild b/sys-apps/systemd-units/systemd-units-22.ebuild index 77f2c5e..48bb880 100644 --- a/sys-apps/systemd-units/systemd-units-21.ebuild +++ b/sys-apps/systemd-units/systemd-units-22.ebuild @@ -12,20 +12,12 @@ SRC_URI="" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="+desktop server" +IUSE="+desktop" RDEPEND="" DEPEND="" src_install() { - if use server; then - systemd_dounit "${FILESDIR}"/services-server/* - ( - insinto /etc/kernel/postinst.d/ - doins "${FILESDIR}"/90_kexec - ) - fi - if use desktop; then systemd_dounit "${FILESDIR}"/services-desktop/* fi @@ -34,11 +26,3 @@ src_install() { # convert the code string "_at" into an '@' before installing. rename '_at' '@' "${D}/$(systemd_get_unitdir)"/* } - -pkg_postinst() { - if use server; then - elog "The file '${ROOT}etc/kernel/postinst.d/90_kexec' has been" - elog "installed for you. If you use kexec, you may want to enable it by" - elog "making it exectuable." - fi -} |