summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2006-04-27 19:27:17 +0200
committerAaron Griffin <aaron@archlinux.org>2006-04-27 19:27:17 +0200
commite93d33835fc2078eafe5c4d923367e1e95f66822 (patch)
tree5fdefb979d7fb999ae2d9a478844def408739b88
parent2ed876b6b5c7b431caf5c452d6ee4a67241c4d01 (diff)
downloadmkinitcpio-e93d33835fc2078eafe5c4d923367e1e95f66822.tar.gz
mkinitcpio-e93d33835fc2078eafe5c4d923367e1e95f66822.tar.xz
init level fix - Thanks, _Gandalf_
fix grep for file/symlink addition - Thanks, _Gandalf_ git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@26 880c04e9-e011-0410-abf7-b926e227c9cd
-rw-r--r--functions4
-rw-r--r--init1
2 files changed, 3 insertions, 2 deletions
diff --git a/functions b/functions
index 8641ca1..f1a9c54 100644
--- a/functions
+++ b/functions
@@ -51,7 +51,7 @@ add_symlink ()
fil="${1}"
dest="${fil##$BASEDIR}"
add_dir $(dirname "${dest}")
- if ! grep "slink ${fil} " "${FILELIST}" 2>&1 > /dev/null; then
+ if ! grep "slink ${dest} " "${FILELIST}" 2>&1 > /dev/null; then
msg " adding symlink ${dest}"
echo "slink ${dest} ${fil} $(stat -c '%a %u %g' ${fil})" >> "${FILELIST}"
fi
@@ -77,7 +77,7 @@ add_file ()
add_dir $(dirname "${dest}")
- if ! grep "file ${fil} " "${FILELIST}" 2>&1 > /dev/null; then
+ if ! grep "file ${dest} " "${FILELIST}" 2>&1 > /dev/null; then
msg " adding file ${dest}"
echo "file ${dest} ${fil} $(stat -c '%a %u %g' ${fil})" >> "${FILELIST}"
fi
diff --git a/init b/init
index 3afc2aa..b0eed45 100644
--- a/init
+++ b/init
@@ -12,6 +12,7 @@ CMDLINE=$(/bin/cat /proc/cmdline)
for cmd in $CMDLINE; do
case "$cmd" in
+ [0123456Ss]) continue ;;
*=*) export "${cmd}" ;;
*) export "${cmd}=y" ;;
esac