aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarren Togami <wtogami@redhat.com>2009-08-31 19:40:34 -0400
committerBill Nottingham <notting@redhat.com>2009-09-02 13:28:52 -0400
commitf1e3b00216c354c9bce703d67334bfcef4bb153a (patch)
treeb3ae72c9ecb228a0b91fdc77b48d54367d775d46
parentc8873ca0216c3808cf4d92a0c697d7278a062d41 (diff)
downloadinitscripts-f1e3b00216c354c9bce703d67334bfcef4bb153a.tar
initscripts-f1e3b00216c354c9bce703d67334bfcef4bb153a.tar.gz
initscripts-f1e3b00216c354c9bce703d67334bfcef4bb153a.tar.bz2
initscripts-f1e3b00216c354c9bce703d67334bfcef4bb153a.tar.xz
initscripts-f1e3b00216c354c9bce703d67334bfcef4bb153a.zip
Support rwtab and state passed from dracut initrd.
-rwxr-xr-xrc.d/rc.sysinit6
1 files changed, 3 insertions, 3 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index dd3c053e..4155c9f2 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -469,7 +469,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/* ; do
+ for file in /etc/rwtab /etc/rwtab.d/* /dev/.initramfs/rwtab ; do
is_ignored_file "$file" && continue
[ -f $file ] && cat $file | while read type path ; do
case "$type" in
@@ -489,8 +489,8 @@ if [ "$READONLY" = "yes" -o "$TEMPORARY_STATE" = "yes" ]; then
done
done
- # Use resolv.conf passed by initramfs netboot
- [ -f /dev/.initramfs/resolv.conf ] && cp /dev/.initramfs/resolv.conf /etc/
+ # Use any state passed by initramfs
+ [ -d /dev/.initramfs/state ] && cp -a /dev/.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.