From 3fe4c09dcce9901eb898850cf9769fd2de84e1ce Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 18 Mar 2014 15:32:02 +0000 Subject: mkinitfs: make sure that we return to original dir --- mkinitfs.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mkinitfs.in b/mkinitfs.in index 5383a98..12ba67c 100755 --- a/mkinitfs.in +++ b/mkinitfs.in @@ -40,6 +40,7 @@ initfs_base() { done mkdir -p $dirs + local oldpwd="$PWD" cd "${basedir:-/}" for file in $(feature_files files); do echo $file @@ -51,6 +52,7 @@ initfs_base() { for i in "$fstab" "$passwd" "$group"; do install -Dm644 "$i" "$tmpdir"/etc/${i##*/} || return 1 done + cd "$oldpwd" } find_kmod_deps() { @@ -89,6 +91,7 @@ END { } find_kmods() { + local oldpwd="$PWD" cd "$kerneldir" || return 1 for file in $(feature_files modules); do if ! [ -e ${file} ]; then @@ -97,6 +100,7 @@ find_kmods() { fi echo $file done | find_kmod_deps + cd "$oldpwd" } initfs_kmods() { @@ -107,11 +111,13 @@ initfs_kmods() { depmod -b "${basedir:-/}" $kernel fi files=$(find_kmods) + local oldpwd="$PWD" cd ${basedir:-/} for file in $files; do echo $file done | cpio -pdm "$tmpdir" depmod $kernel -b "$tmpdir" + cd "$oldpwd" } initfs_apk_keys() { -- cgit v1.2.3