diff options
| author | Will Woods <wwoods@redhat.com> | 2012-07-17 13:48:44 -0400 |
|---|---|---|
| committer | Will Woods <wwoods@redhat.com> | 2012-08-02 16:43:58 -0400 |
| commit | 166a9ca1246e6c0b094c2055c29d4a0304f19abb (patch) | |
| tree | 1475f4a144b58e5083010c945cfe8e5abf09fdd2 /data | |
| parent | ab62cedde1c35621dacadb33a8376b3dd51a8364 (diff) | |
| download | anaconda-166a9ca1246e6c0b094c2055c29d4a0304f19abb.tar.gz anaconda-166a9ca1246e6c0b094c2055c29d4a0304f19abb.tar.xz anaconda-166a9ca1246e6c0b094c2055c29d4a0304f19abb.zip | |
Re-remove fedora-import-state
Commit c8c14c9 deleted these two files, but they got resurrected in some
merge somehow. Delete them again, since we don't need them.
Diffstat (limited to 'data')
| -rw-r--r-- | data/systemd/fedora-import-state | 14 | ||||
| -rw-r--r-- | data/systemd/fedora-import-state.service | 13 |
2 files changed, 0 insertions, 27 deletions
diff --git a/data/systemd/fedora-import-state b/data/systemd/fedora-import-state deleted file mode 100644 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 |