Linux Archive

Linux Archive (http://www.linux-archive.org/)
-   Ubuntu User (http://www.linux-archive.org/ubuntu-user/)
-   -   Re-remove fedora-import-state (http://www.linux-archive.org/ubuntu-user/684960-re-remove-fedora-import-state.html)

Will Woods 07-18-2012 07:01 PM

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.
---
data/systemd/fedora-import-state | 14 --------------
data/systemd/fedora-import-state.service | 13 -------------
2 files changed, 27 deletions(-)
delete mode 100644 data/systemd/fedora-import-state
delete mode 100644 data/systemd/fedora-import-state.service

diff --git a/data/systemd/fedora-import-state b/data/systemd/fedora-import-state
deleted file mode 100644
index a853ab9..0000000
--- 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 5294fe1..0000000
--- 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
--
1.7.10.4

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

Will Woods 07-18-2012 07:03 PM

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.
---
data/systemd/fedora-import-state | 14 --------------
data/systemd/fedora-import-state.service | 13 -------------
2 files changed, 27 deletions(-)
delete mode 100644 data/systemd/fedora-import-state
delete mode 100644 data/systemd/fedora-import-state.service

diff --git a/data/systemd/fedora-import-state b/data/systemd/fedora-import-state
deleted file mode 100644
index a853ab9..0000000
--- 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 5294fe1..0000000
--- 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
--
1.7.10.4

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

Will Woods 07-18-2012 07:06 PM

Re-remove fedora-import-state
 
BLUH. Sorry about the multiple emails, I had a git send-email problem.
Actual patches sent to anaconda-patches@lists.fedorahosted.org instead.

Sorry!

-w

On Wed, 2012-07-18 at 15:03 -0400, Will Woods wrote:
> Commit c8c14c9 deleted these two files, but they got resurrected in some
> merge somehow. Delete them again, since we don't need them.
> ---
> data/systemd/fedora-import-state | 14 --------------
> data/systemd/fedora-import-state.service | 13 -------------
> 2 files changed, 27 deletions(-)
> delete mode 100644 data/systemd/fedora-import-state
> delete mode 100644 data/systemd/fedora-import-state.service
>
> diff --git a/data/systemd/fedora-import-state b/data/systemd/fedora-import-state
> deleted file mode 100644
> index a853ab9..0000000
> --- 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 5294fe1..0000000
> --- 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


_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


All times are GMT. The time now is 07:46 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.