diff options
author | Thomas Bächler <thomas@archlinux.org> | 2011-02-01 20:28:45 +0100 |
---|---|---|
committer | Thomas Bächler <thomas@archlinux.org> | 2011-02-01 20:28:45 +0100 |
commit | 42e8dba5dce4879e4a372c5c2fb5446b4e8bb16c (patch) | |
tree | 7d4f7501b1c335d50e9776b36f97938bb9f427c0 | |
parent | 3fbbcdf2480bc091f44c7b15d875f313ac7ddbed (diff) | |
download | mkinitcpio-42e8dba5dce4879e4a372c5c2fb5446b4e8bb16c.tar.gz mkinitcpio-42e8dba5dce4879e4a372c5c2fb5446b4e8bb16c.tar.xz |
Remove some obsolete 'export's
-rw-r--r-- | hooks/net | 2 | ||||
-rw-r--r-- | init | 19 |
2 files changed, 10 insertions, 11 deletions
@@ -6,7 +6,7 @@ run_hook () : > /ip_opts if [ -z "${ip}" -a -n "${nfsaddrs}" ]; then - export ip="${nfsaddrs}" + ip="${nfsaddrs}" fi if [ -n "${ip}" ]; then @@ -20,10 +20,9 @@ else fi read CMDLINE </proc/cmdline -export CMDLINE -export root="" -export init="" +root="" +init="" echo "/sbin/modprobe" > /proc/sys/kernel/modprobe # set default mount handler @@ -34,10 +33,10 @@ if [ -x /sbin/udevd ]; then msg ":: Starting udevd..." echo > /proc/sys/kernel/hotplug /sbin/udevd --daemon --resolve-names=never - export udevd_running=1 + udevd_running=1 msg "done." else - export udevd_running=0 + udevd_running=0 fi for cmd in ${CMDLINE}; do @@ -53,24 +52,24 @@ for cmd in ${CMDLINE}; do *=*) rhs="$(echo "${cmd}" | cut -d= -f2-)" cmd="$(echo "${cmd}" | cut -d= -f1 | sed 's|\.|_|g')" cmd="$(echo "${cmd}" | sed 's|-|_|g')=${rhs}" - (echo "${cmd}" | grep -qe '^[0-9]') || export "${cmd}" + (echo "${cmd}" | grep -qe '^[0-9]') || eval "${cmd}" ;; *) cmd="$(echo "${cmd}" | sed 's|\.|_|g')" cmd="$(echo "${cmd}" | sed 's|-|_|g')" - (echo "${cmd}" | grep -qe '^[0-9]') || export "${cmd}=y" + (echo "${cmd}" | grep -qe '^[0-9]') || eval "${cmd}=y" ;; esac done if [ -n "${disablehooks}" ]; then for d in $(echo "${disablehooks}" | sed 's|,| |g'); do - export "hook_${d}=disabled" + eval "hook_${d}=disabled" done fi if [ -n "${disablemodules}" ]; then for d in $(echo "${disablemodules}" | sed 's|,| |g'); do - export "mod_${d}=disabled" + eval "mod_${d}=disabled" done fi @@ -92,7 +91,7 @@ done # If rootdelay is empty or not a non-negative integer, set it to 10 if [ -z "${rootdelay}" ] || ! [ "${rootdelay}" -ge 0 ]; then - export rootdelay=10 + rootdelay=10 fi if [ -e "/hooks" ]; then |