Browse Source

base/init: removed rd.timestamp and automatically export RD_*

master
Harald Hoyer 14 years ago
parent
commit
5d7cdc38d0
  1. 8
      dracut.kernel.7.xml
  2. 10
      modules.d/99base/init

8
dracut.kernel.7.xml

@ -169,14 +169,6 @@ This parameter can be specified multiple times.</para>
<para>set udev to loglevel debug</para> <para>set udev to loglevel debug</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term>
<envar>rd.timestamp</envar>
</term>
<listitem>
<para>export RDTIMESTAMP environment variable to init, which is set to the uptime of the dracut start.</para>
</listitem>
</varlistentry>
</variablelist> </variablelist>
</refsect2> </refsect2>
<refsect2> <refsect2>

10
modules.d/99base/init

@ -332,12 +332,14 @@ for i in $(export -p); do
i=${i#declare -x} i=${i#declare -x}
i=${i#export} i=${i#export}
strstr "$i" "=" || continue strstr "$i" "=" || continue
# skip RD_ vars
i=${i%%=*} i=${i%%=*}
[ -z "$i" ] && continue [ -z "$i" ] && continue
case $i in case $i in
root|PATH|HOME|TERM|PS4|RD_*) root|PATH|HOME|TERM|PS4|RD_*)
:;; :;;
# skip RD_ vars and export them
RD_*)
export $i;;
*) *)
unset "$i";; unset "$i";;
esac esac
@ -377,12 +379,6 @@ if getargbool 0 rd.copystate -y rdcopystate; then
cp -axr /tmp/* /run/initramfs/ >/dev/null 2>&1 cp -axr /tmp/* /run/initramfs/ >/dev/null 2>&1
fi fi


if getargbool 1 rd.timestamp; then
export RD_TIMESTAMP
else
unset RD_TIMESTAMP
fi

info "Switching root" info "Switching root"


wait_for_loginit wait_for_loginit

Loading…
Cancel
Save