diff options
author | Will Woods <wwoods@redhat.com> | 2012-03-08 15:13:02 -0500 |
---|---|---|
committer | Bill Nottingham <notting@redhat.com> | 2012-03-08 15:31:42 -0500 |
commit | a93d20bb3604bed86e3d1bb74513e428b21242cd (patch) | |
tree | 678d5fa1150ffe266065c3edd09faba397beb22e /rc.d | |
parent | 5cf9796c2334898b908e91810e03552688bb690c (diff) | |
download | initscripts-a93d20bb3604bed86e3d1bb74513e428b21242cd.tar initscripts-a93d20bb3604bed86e3d1bb74513e428b21242cd.tar.gz initscripts-a93d20bb3604bed86e3d1bb74513e428b21242cd.tar.bz2 initscripts-a93d20bb3604bed86e3d1bb74513e428b21242cd.tar.xz initscripts-a93d20bb3604bed86e3d1bb74513e428b21242cd.zip |
Use /run/initramfs instead of /dev/.initramfs
Current dracut saves state to /run/initramfs, since /run is standard
now.
This patch makes rc.sysinit and fedora-readonly check for files in
/run/initramfs/rwtab and /run/initramfs/state (which is where dracut
writes them).
It also makes ifup-eth look for lease files in /run/initramfs.
Diffstat (limited to 'rc.d')
-rwxr-xr-x | rc.d/rc.sysinit | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 5248cfb1..6363e4ca 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -301,7 +301,7 @@ if [ "$READONLY" = "yes" -o "$TEMPORARY_STATE" = "yes" ]; then mount -n -t tmpfs $RW_OPTIONS $mountopts none "$RW_MOUNT" fi - for file in /etc/rwtab /etc/rwtab.d/* /dev/.initramfs/rwtab ; do + for file in /etc/rwtab /etc/rwtab.d/* /run/initramfs/rwtab; do is_ignored_file "$file" && continue [ -f $file ] && cat $file | while read type path ; do case "$type" in @@ -322,7 +322,7 @@ if [ "$READONLY" = "yes" -o "$TEMPORARY_STATE" = "yes" ]; then done # Use any state passed by initramfs - [ -d /dev/.initramfs/state ] && cp -a /dev/.initramfs/state/* $RW_MOUNT + [ -d /run/initramfs/state ] && cp -a /run/initramfs/state/* $RW_MOUNT # In theory there should be no more than one network interface active # this early in the boot process -- the one we're booting from. |