summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdata/systemd/fedora-import-state8
-rw-r--r--data/systemd/fedora-import-state.service1
2 files changed, 7 insertions, 2 deletions
diff --git a/data/systemd/fedora-import-state b/data/systemd/fedora-import-state
index 7979e2446..a853ab9cd 100755
--- a/data/systemd/fedora-import-state
+++ b/data/systemd/fedora-import-state
@@ -1,8 +1,14 @@
#!/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 / . || exit 1
+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
index 4d403a44e..5294fe172 100644
--- a/data/systemd/fedora-import-state.service
+++ b/data/systemd/fedora-import-state.service
@@ -11,4 +11,3 @@ ExecStart=/lib/systemd/fedora-import-state
Type=oneshot
TimeoutSec=0
RemainAfterExit=yes
-