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

Remove crypttab handling services.

Browse Source
This commit is contained in:
Bill Nottingham 2010-11-16 22:20:47 -05:00
parent 66aecb0132
commit 884d2ff009
2 changed files with 126 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
48da8e5.patch Normal file
View File

@ -0,0 +1,120 @@
commit 48da8e510bca624516172aa144b48a850f0e4ac9
Author: Bill Nottingham <notting@redhat.com>
Date: Tue Nov 16 22:18:58 2010 -0500
Don't use our crypto init ; systemd handles this.
diff --git a/systemd/fedora-init-crypto b/systemd/fedora-init-crypto
deleted file mode 100755
index 79d18be..0000000
--- a/systemd/fedora-init-crypto
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-. /etc/init.d/functions
-
-init_crypto $1 || :
diff --git a/systemd/fedora-storage-init b/systemd/fedora-storage-init
index 0e3a417..b01a465 100755
--- a/systemd/fedora-storage-init
+++ b/systemd/fedora-storage-init
@@ -36,5 +36,3 @@ fi
if [ -x /sbin/lvm ]; then
action $"Setting up Logical Volume Management:" /sbin/lvm vgchange -a y --sysinit
fi
-
-[ -f /etc/crypttab ] && init_crypto 0
diff --git a/systemd/system/fedora-autoswap.service b/systemd/system/fedora-autoswap.service
index 8cd881d..d7f667d 100644
--- a/systemd/system/fedora-autoswap.service
+++ b/systemd/system/fedora-autoswap.service
@@ -3,8 +3,8 @@ Description=Enable all detected swap partitions
DefaultDependencies=no
Conflicts=shutdown.target
Before=shutdown.target emergency.service emergency.target
-After=local-fs.target fedora-init-crypto-3.service
-Requires=local-fs.target fedora-init-crypto-3.service
+After=local-fs.target
+Requires=local-fs.target
[Service]
ExecStart=/lib/systemd/fedora-autoswap
diff --git a/systemd/system/fedora-init-crypto-1.service b/systemd/system/fedora-init-crypto-1.service
deleted file mode 100644
index 6d6b732..0000000
--- a/systemd/system/fedora-init-crypto-1.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Initialize encrypted storage
-DefaultDependencies=no
-Conflicts=shutdown.target
-Before=shutdown.target emergency.service emergency.target
-After=fedora-wait-storage.service
-Requires=fedora-wait-storage.service
-ConditionPathExists=/etc/crypttab
-
-[Service]
-ExecStart=/lib/systemd/fedora-init-crypto 0
-Type=oneshot
-TimeoutSec=0
-RemainAfterExit=yes
-StandardInput=tty
diff --git a/systemd/system/fedora-init-crypto-2.service b/systemd/system/fedora-init-crypto-2.service
deleted file mode 100644
index c01bbd1..0000000
--- a/systemd/system/fedora-init-crypto-2.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Initialize encrypted filesystems on top of other storage
-DefaultDependencies=no
-Conflicts=shutdown.target
-Before=shutdown.target emergency.service emergency.target
-After=fedora-storage-init.service
-Requires=fedora-storage-init.service
-ConditionPathExists=/etc/crypttab
-
-[Service]
-ExecStart=/lib/systemd/fedora-init-crypto 0
-Type=oneshot
-TimeoutSec=0
-RemainAfterExit=yes
-StandardInput=tty
diff --git a/systemd/system/fedora-init-crypto-3.service b/systemd/system/fedora-init-crypto-3.service
deleted file mode 100644
index 84b11fd..0000000
--- a/systemd/system/fedora-init-crypto-3.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Initialize encrypted filesystems on top of other storage
-DefaultDependencies=no
-Conflicts=shutdown.target
-Before=shutdown.target emergency.service emergency.target
-After=systemd-random-seed-load.service
-Requires=systemd-random-seed-load.service
-ConditionPathExists=/etc/crypttab
-
-[Service]
-ExecStart=/lib/systemd/fedora-init-crypto 1
-Type=oneshot
-TimeoutSec=0
-RemainAfterExit=yes
-StandardInput=tty
diff --git a/systemd/system/fedora-storage-init.service b/systemd/system/fedora-storage-init.service
index 2806c2d..bd8e02f 100644
--- a/systemd/system/fedora-storage-init.service
+++ b/systemd/system/fedora-storage-init.service
@@ -3,8 +3,8 @@ Description=Initialize storage subsystems (RAID, LVM, etc.)
DefaultDependencies=no
Conflicts=shutdown.target
Before=shutdown.target local-fs.target emergency.service emergency.target
-After=fedora-wait-storage.service fedora-init-crypto-1.service
-Requires=fedora-wait-storage.service fedora-init-crypto-1.service
+After=fedora-wait-storage.service
+Requires=fedora-wait-storage.service
[Service]
ExecStart=/lib/systemd/fedora-storage-init

7
initscripts.spec
View File

@ -8,7 +8,7 @@ Version: 9.22
# ppp-watch is GPLv2+, everything else is GPLv2
License: GPLv2 and GPLv2+
Group: System Environment/Base
Release: 1%{?dist}
Release: 2%{?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
@ -59,6 +59,7 @@ Requires(pre): /usr/sbin/groupadd
Requires(post): /sbin/chkconfig, coreutils
Requires(preun): /sbin/chkconfig
BuildRequires: glib2-devel popt-devel gettext pkgconfig
Patch: 48da8e5.patch
%description
The initscripts package contains the basic system scripts used to boot
@ -88,6 +89,7 @@ Currently, this consists of various memory checking code.
%prep
%setup -q
%patch -p1
%build
make
@ -307,6 +309,9 @@ rm -rf $RPM_BUILD_ROOT
/etc/profile.d/debug*
%changelog
* Tue Nov 16 2010 Bill Nottingham <notting@redhat.com> - 9.22-2
- remove our own crypttab services in favor of systemd's
* Tue Nov 16 2010 Bill Nottingham <notting@redhat.com> - 9.22-1
- merge in systemd-specific startup support; package a -legacy package
(based on work by <harald@redhat.com>)