rpms/initscripts
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove fedora-sysinit-hack/unhack

Browse Source
This commit is contained in:
Bill Nottingham 2011-07-25 15:06:15 -04:00
parent 067b5ca6da
commit 6c00bf1598
2 changed files with 61 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
initscripts.spec
View File

@ -8,7 +8,7 @@ Version: 9.31
# ppp-watch is GPLv2+, everything else is GPLv2
License: GPLv2 and GPLv2+
Group: System Environment/Base
Release: 2%{?dist}
Release: 3%{?dist}
URL: http://fedorahosted.org/releases/i/n/initscripts/
Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@ -61,6 +61,7 @@ Requires(post): /sbin/chkconfig, coreutils
Requires(preun): /sbin/chkconfig
BuildRequires: glib2-devel popt-devel gettext pkgconfig
Patch0: multipath-nosync.patch
Patch1: remove-hack.patch
%description
The initscripts package contains the basic system scripts used to boot
@ -91,6 +92,7 @@ Currently, this consists of various memory checking code.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
make
@ -316,6 +318,9 @@ rm -rf $RPM_BUILD_ROOT
/etc/profile.d/debug*
%changelog
* Mon Jul 25 2011 Bill Nottingham <notting@redhat.com> - 9.31-3
- remove fedora-sysinit-hack/unhack; they're not needed with /var/lock/subsys on tmpfs
* Fri Jul 22 2011 Bill Nottingham <notting@redhat.com> - 9.31-2
- work around multipath/udev incompatibility (#723357, <bmarzins@redhat.com>)

55
remove-hack.patch Normal file
View File

@ -0,0 +1,55 @@
commit b710648dee63466be01b34b21d929ada422f2845
Author: Bill Nottingham <notting@redhat.com>
Date: Mon Jul 25 13:34:12 2011 -0400
Remove fedora-sysinit-hack/fedora-sysinit-unhack; they're not needed with /var/lock on tmpfs.
diff --git a/Makefile b/Makefile
index 718b451..1e8c09e 100644
--- a/Makefile
+++ b/Makefile
@@ -127,11 +127,9 @@ install:
ln -s ../fedora-autoswap.service $(ROOT)/lib/systemd/system/basic.target.wants
ln -s ../fedora-autorelabel.service $(ROOT)/lib/systemd/system/basic.target.wants
ln -s ../fedora-autorelabel-mark.service $(ROOT)/lib/systemd/system/basic.target.wants
- ln -s ../fedora-sysinit-hack.service $(ROOT)/lib/systemd/system/basic.target.wants
ln -s ../fedora-readonly.service $(ROOT)/lib/systemd/system/local-fs.target.wants
ln -s ../fedora-storage-init.service $(ROOT)/lib/systemd/system/local-fs.target.wants
ln -s ../fedora-storage-init-late.service $(ROOT)/lib/systemd/system/local-fs.target.wants
- ln -s ../fedora-sysinit-unhack.service $(ROOT)/lib/systemd/system/multi-user.target.wants
mkdir -p $(ROOT)/etc/tmpfiles.d
install -m 644 initscripts.tmpfiles.d $(ROOT)/etc/tmpfiles.d/initscripts.conf
diff --git a/systemd/system/fedora-sysinit-hack.service b/systemd/system/fedora-sysinit-hack.service
deleted file mode 100644
index dd78da8..0000000
--- a/systemd/system/fedora-sysinit-hack.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Bootup hack
-DefaultDependencies=no
-Conflicts=shutdown.target
-Before=basic.target shutdown.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/touch /dev/.in_sysinit
diff --git a/systemd/system/fedora-sysinit-unhack.service b/systemd/system/fedora-sysinit-unhack.service
deleted file mode 100644
index 221d8bb..0000000
--- a/systemd/system/fedora-sysinit-unhack.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Bootup unhack
-DefaultDependencies=no
-Conflicts=shutdown.target
-Before=shutdown.target
-After=fedora-sysinit-hack.service sysinit.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=-/bin/rm -f /dev/.in_sysinit