diff options
| author | Nicolas Lécureuil <neoclust@mageia.org> | 2016-02-12 13:41:11 +0100 |
|---|---|---|
| committer | Nicolas Lécureuil <neoclust@mageia.org> | 2016-02-12 13:41:11 +0100 |
| commit | b91d741cab5facd8f2bb87b2d6a1d172459ae606 (patch) | |
| tree | a0f1d55f9a2f61a22a9d590a05877dc885340eac /systemd | |
| parent | 052f95ee56dcc8cb8e815b7dadb2056caf484128 (diff) | |
| parent | 3cc6e647008a06a13fac1e0c8885807a1e0b661b (diff) | |
| download | initscripts-b91d741cab5facd8f2bb87b2d6a1d172459ae606.tar initscripts-b91d741cab5facd8f2bb87b2d6a1d172459ae606.tar.gz initscripts-b91d741cab5facd8f2bb87b2d6a1d172459ae606.tar.bz2 initscripts-b91d741cab5facd8f2bb87b2d6a1d172459ae606.tar.xz initscripts-b91d741cab5facd8f2bb87b2d6a1d172459ae606.zip | |
Merge tag 'initscripts-9.56-1' into distro/mga
Tag as initscripts-9.56-1
Diffstat (limited to 'systemd')
| -rwxr-xr-x | systemd/fedora-import-state | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/systemd/fedora-import-state b/systemd/fedora-import-state index a853ab9c..7809ca81 100755 --- a/systemd/fedora-import-state +++ b/systemd/fedora-import-state @@ -1,14 +1,11 @@ #!/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 / . +find . -mindepth 1 -maxdepth 1 -exec cp -av -t / {} \; # run restorecon on the copied files if [ -e /sys/fs/selinux/enforce ]; then - find . | ( cd /; restorecon -i -f -; ) || : + find . -mindepth 1 -print0 | { cd / && xargs --null restorecon -i; } fi |