From e2bf0309756b52584fc99abe1e1d032368eb5611 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Fri, 6 Feb 2015 14:01:04 +0000 Subject: [PATCH] - updated to 0.4.13, dropped systemd stuff --- rc-local.service | 19 ------------------- rc-scripts.spec | 25 +++++-------------------- rc-scripts.tmpfiles | 1 - sys-chroots.service | 12 ------------ 4 files changed, 5 insertions(+), 52 deletions(-) delete mode 100644 rc-local.service delete mode 100644 rc-scripts.tmpfiles delete mode 100644 sys-chroots.service diff --git a/rc-local.service b/rc-local.service deleted file mode 100644 index 233c8fb..0000000 --- a/rc-local.service +++ /dev/null @@ -1,19 +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=/etc/rc.d/rc.local Compatibility -After=network.target local-fs.target remote-fs.target - -[Service] -Type=forking -ExecStart=/etc/rc.d/init.d/local start -ExecStop=-/bin/rm -f /var/lock/subsys/local -TimeoutSec=0 -StandardOutput=tty -RemainAfterExit=yes -SysVStartPriority=99 diff --git a/rc-scripts.spec b/rc-scripts.spec index abe17ea..ae4a0f2 100644 --- a/rc-scripts.spec +++ b/rc-scripts.spec @@ -7,15 +7,12 @@ Summary(fr.UTF-8): inittab et scripts /etc/rc.d Summary(pl.UTF-8): inittab i skrypty startowe z katalogu /etc/rc.d Summary(tr.UTF-8): inittab ve /etc/rc.d dosyaları Name: rc-scripts -Version: 0.4.12 -Release: 5 +Version: 0.4.13 +Release: 1 License: GPL v2 Group: Base Source0: %{name}-%{version}.tar.gz -# Source0-md5: b52ca02678cb5f468972db06c6d032b0 -Source1: rc-local.service -Source2: sys-chroots.service -Source3: %{name}.tmpfiles +# Source0-md5: 7df99aa887070a0d83a0daa28bf7deb9 Patch100: %{name}-tld.patch Patch101: %{name}-no_tmpfs_root_fsck.patch Patch102: %{name}-selinuxfs_mount.patch @@ -27,7 +24,7 @@ Patch107: %{name}-misc.patch URL: http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts BuildRequires: autoconf BuildRequires: automake -BuildRequires: gettext-devel +BuildRequires: gettext-tools BuildRequires: glib2-devel %{?with_static:BuildRequires: glib2-static} %{?with_static:BuildRequires: glibc-static} @@ -141,8 +138,7 @@ sed -i -e 's#^GLIB_LIBS=.*#GLIB_LIBS="%{_prefix}/%{_lib}/libglib-2.0.a -lrt -lpt %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/var/{run/netreport,log} \ - $RPM_BUILD_ROOT/etc/sysconfig/{interfaces/data,hwprofiles} \ - $RPM_BUILD_ROOT{%{systemdtmpfilesdir},%{systemdunitdir}} + $RPM_BUILD_ROOT/etc/sysconfig/{interfaces/data,hwprofiles} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ @@ -191,12 +187,6 @@ done # make /etc/init.d symlink relative ln -nfs rc.d/init.d $RPM_BUILD_ROOT/etc/init.d -# systemd -install %{SOURCE1} $RPM_BUILD_ROOT%{systemdunitdir}/rc-local.service -ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/local.service -install %{SOURCE2} $RPM_BUILD_ROOT%{systemdunitdir}/sys-chroots.service -install %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf - # packaged into SysVinit and systemd-init (supported options differ) %{__rm} $RPM_BUILD_ROOT%{_mandir}/man5/crypttab.5 @@ -327,11 +317,6 @@ done %attr(755,root,root) /lib/firmware/firmware-loader.sh -%{systemdtmpfilesdir}/rc-scripts.conf -%{systemdunitdir}/local.service -%{systemdunitdir}/rc-local.service -%{systemdunitdir}/sys-chroots.service - %dir /lib/rc-scripts %attr(755,root,root) /lib/rc-scripts/ifdown-bond %attr(755,root,root) /lib/rc-scripts/ifdown-br diff --git a/rc-scripts.tmpfiles b/rc-scripts.tmpfiles deleted file mode 100644 index 187de38..0000000 --- a/rc-scripts.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /var/run/netreport 0750 root root - diff --git a/sys-chroots.service b/sys-chroots.service deleted file mode 100644 index 9ea1c15..0000000 --- a/sys-chroots.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=/etc/rc.d/init.d/sys-chroots Compatibility -After=network.target local-fs.target remote-fs.target - -[Service] -Type=forking -ExecStart=/etc/rc.d/init.d/sys-chroots start -ExecStop=/etc/rc.d/init.d/sys-chroots stop -TimeoutSec=0 -StandardOutput=tty -RemainAfterExit=yes -SysVStartPriority=99 -- 2.46.0