diff options
| author | Will Woods <wwoods@redhat.com> | 2012-03-16 14:44:29 -0400 |
|---|---|---|
| committer | Will Woods <wwoods@redhat.com> | 2012-03-16 14:44:29 -0400 |
| commit | c8c14c926a25cdbcaac1fc1ac4fdbf11066980f9 (patch) | |
| tree | ef2cf56a44427ebb18c622064a88199631c0c364 /data | |
| parent | 68af8fe2bb4e6ac67cfa69c2d0c7bca648a03def (diff) | |
| download | anaconda-c8c14c926a25cdbcaac1fc1ac4fdbf11066980f9.tar.gz anaconda-c8c14c926a25cdbcaac1fc1ac4fdbf11066980f9.tar.xz anaconda-c8c14c926a25cdbcaac1fc1ac4fdbf11066980f9.zip | |
fedora-import-state.service is in initscripts now
initscripts-9.35-1 contains fedora-import-state.service, so we can drop
this from here.
Diffstat (limited to 'data')
| -rw-r--r-- | data/systemd/Makefile.am | 4 | ||||
| -rwxr-xr-x | data/systemd/fedora-import-state | 14 | ||||
| -rw-r--r-- | data/systemd/fedora-import-state.service | 13 |
3 files changed, 1 insertions, 30 deletions
diff --git a/data/systemd/Makefile.am b/data/systemd/Makefile.am index ae71a966b..589854cfa 100644 --- a/data/systemd/Makefile.am +++ b/data/systemd/Makefile.am @@ -18,7 +18,5 @@ # Author: Chris Lumens <clumens@redhat.com> systemddir = /lib/systemd/system -dist_systemd_DATA = anaconda-shell@.service anaconda.target anaconda.service instperf.service fedora-import-state.service -systemdscriptdir = /lib/systemd -dist_systemd_SCRIPTS = fedora-import-state +dist_systemd_DATA = anaconda-shell@.service anaconda.target anaconda.service instperf.service MAINTAINERCLEANFILES = Makefile.in diff --git a/data/systemd/fedora-import-state b/data/systemd/fedora-import-state deleted file mode 100755 index a853ab9cd..000000000 --- a/data/systemd/fedora-import-state +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -# fedora-import-state: import state files from initramfs (e.g. network config) - -# exit early if root isn't writeable -[ -w / ] || exit 0 - -# copy state into root -cd /run/initramfs/state -cp -a -t / . - -# run restorecon on the copied files -if [ -e /sys/fs/selinux/enforce ]; then - find . | ( cd /; restorecon -i -f -; ) || : -fi diff --git a/data/systemd/fedora-import-state.service b/data/systemd/fedora-import-state.service deleted file mode 100644 index 5294fe172..000000000 --- a/data/systemd/fedora-import-state.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Import network configuration from initramfs -DefaultDependencies=no -ConditionDirectoryNotEmpty=/run/initramfs/state -Conflicts=shutdown.target -Before=shutdown.target emergency.service emergency.target systemd-tmpfiles-setup.service -After=remount-rootfs.service - -[Service] -ExecStart=/lib/systemd/fedora-import-state -Type=oneshot -TimeoutSec=0 -RemainAfterExit=yes |