remove useless grouping
This commit is contained in:
parent
9450a3535e
commit
bd6ec54fb7
16
generate
16
generate
@ -119,17 +119,17 @@ create_symlinks() {
|
|||||||
|
|
||||||
msg info "creating symlinks"
|
msg info "creating symlinks"
|
||||||
|
|
||||||
# TODO remove grouping
|
(
|
||||||
( cd "$wrkdir" && {
|
cd "$wrkdir"
|
||||||
ln -s usr/lib lib
|
ln -s usr/lib lib
|
||||||
ln -s usr/lib lib64
|
ln -s usr/lib lib64
|
||||||
ln -s usr/bin bin
|
ln -s usr/bin bin
|
||||||
ln -s usr/bin sbin
|
ln -s usr/bin sbin
|
||||||
ln -s ../run var/run
|
ln -s ../run var/run
|
||||||
cd "${wrkdir}/usr"
|
cd usr
|
||||||
ln -s bin sbin
|
ln -s bin sbin
|
||||||
ln -s lib lib64
|
ln -s lib lib64
|
||||||
} )
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
install_mdev() {
|
install_mdev() {
|
||||||
@ -221,7 +221,7 @@ install_driver() {
|
|||||||
# shellcheck disable=SC2068
|
# shellcheck disable=SC2068
|
||||||
for driver in $@; do
|
for driver in $@; do
|
||||||
|
|
||||||
# strip path and extension
|
# strip path and extension if any
|
||||||
driver="${driver##*/}"
|
driver="${driver##*/}"
|
||||||
driver="${driver%%.*}"
|
driver="${driver%%.*}"
|
||||||
|
|
||||||
@ -428,6 +428,9 @@ parse_conf
|
|||||||
: "${filesdir:=$(readlink -f $(dirname "$0"))}"
|
: "${filesdir:=$(readlink -f $(dirname "$0"))}"
|
||||||
: "${initramfs:=${filesdir}/initramfs-${kernel}}"
|
: "${initramfs:=${filesdir}/initramfs-${kernel}}"
|
||||||
|
|
||||||
|
# remove wrkdir on exit or unexpected error
|
||||||
|
trap remove_wrkdir EXIT INT
|
||||||
|
|
||||||
[ "$debug" = 1 ] && {
|
[ "$debug" = 1 ] && {
|
||||||
# debug shell commands
|
# debug shell commands
|
||||||
set -x
|
set -x
|
||||||
@ -435,9 +438,6 @@ parse_conf
|
|||||||
trap - EXIT INT
|
trap - EXIT INT
|
||||||
}
|
}
|
||||||
|
|
||||||
# remove wrkdir on exit or unexpected error
|
|
||||||
trap remove_wrkdir EXIT INT
|
|
||||||
|
|
||||||
create_wrkdir
|
create_wrkdir
|
||||||
create_structure
|
create_structure
|
||||||
create_symlinks
|
create_symlinks
|
||||||
|
Loading…
Reference in New Issue
Block a user