diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-10-20 09:22:06 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-10-20 09:22:06 +0000 |
| commit | 6aba975e73e7cea833640e8db180c0add01ecf33 (patch) | |
| tree | 258e71b68383108d4634e0546dbd0decb948695d /mkinitfs.in | |
| parent | f9796dc318ddbf24f8f1fad67aeaea07fe416bd9 (diff) | |
| parent | 3c0420ee47d4389f4e6b8faeb109b0901835898f (diff) | |
| download | mkinitfs-6aba975e73e7cea833640e8db180c0add01ecf33.tar.bz2 mkinitfs-6aba975e73e7cea833640e8db180c0add01ecf33.tar.xz | |
Merge branch 'master' into nlplug-findfs
Diffstat (limited to 'mkinitfs.in')
| -rwxr-xr-x | mkinitfs.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkinitfs.in b/mkinitfs.in index d2a7890..14c728f 100755 --- a/mkinitfs.in +++ b/mkinitfs.in @@ -184,7 +184,7 @@ done shift $(( $OPTIND - 1 )) . $(readlink -f "$config") -features_dir=${features_dir:-"$sysconfdir/features.d"} +features_dir=${features_dir:-"${basedir%/:-}/${sysconfdir#/}/features.d"} [ -n "$myfeatures" ] && features="$myfeatures" if [ -n "$list_features" ]; then |