emo/tinyramfs
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

rename wrkdir to workdir

Browse Source
This commit is contained in:
illiliti 2020-02-24 21:56:12 +03:00
parent 40561d4c82
commit 4909fa6684
1 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
tinyramfs
View File

@ -77,24 +77,24 @@ parse_conf() {
done < "${config:-$(readlink -f $(dirname "$0"))/config}" || msg panic "failed to parse config" done < "${config:-$(readlink -f $(dirname "$0"))/config}" || msg panic "failed to parse config"
} }
create_wrkdir() { create_workdir() {
msg info "creating working directory" msg info "creating working directory"
if [ "$XDG_CACHE_HOME" ]; then if [ "$XDG_CACHE_HOME" ]; then
wrkdir="${XDG_CACHE_HOME}/initramfs.$$" workdir="${XDG_CACHE_HOME}/initramfs.$$"
elif [ "$TMPDIR" ]; then elif [ "$TMPDIR" ]; then
wrkdir="${TMPDIR}/initramfs.$$" workdir="${TMPDIR}/initramfs.$$"
else else
wrkdir="/tmp/initramfs.$$" workdir="/tmp/initramfs.$$"
fi fi
mkdir "$wrkdir" || msg panic "failed to create working directory" mkdir "$workdir" || msg panic "failed to create working directory"
} }
remove_wrkdir() { remove_workdir() {
msg info "removing working directory" msg info "removing working directory"
rm -rf "$wrkdir" rm -rf "$workdir"
} }
install_requirements() { install_requirements() {
@ -114,7 +114,7 @@ create_structure() {
msg info "creating directory structure" msg info "creating directory structure"
for dir in dev tmp var run etc usr/lib usr/bin mnt/root proc root sys; do for dir in dev tmp var run etc usr/lib usr/bin mnt/root proc root sys; do
mkdir -p "${wrkdir}/${dir}" mkdir -p "${workdir}/${dir}"
done done
} }
@ -122,12 +122,12 @@ create_symlinks() {
# some dynamically linked libraries and binaries compiled with hardcoded # some dynamically linked libraries and binaries compiled with hardcoded
# dependencies path. to make it worked we need create symlinks for them. # dependencies path. to make it worked we need create symlinks for them.
# also POSIX ln doesn't have --relative flag like in GNU ln. as workaround # also POSIX ln doesn't have --relative flag like in GNU ln. as workaround
# we change directory to wrkdir and make needed symlinks. # we change directory to workdir and make needed symlinks.
msg info "creating symlinks" msg info "creating symlinks"
( (
cd "$wrkdir" cd "$workdir"
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
@ -142,8 +142,8 @@ create_symlinks() {
install_mdev() { install_mdev() {
msg info "installing mdev" msg info "installing mdev"
install -m644 "${filesdir}/mdev.conf" -t "${wrkdir}/etc" install -m644 "${filesdir}/mdev.conf" -t "${workdir}/etc"
install -Dm755 "${filesdir}/storage-device" -t "${wrkdir}/lib/mdev" install -Dm755 "${filesdir}/storage-device" -t "${workdir}/lib/mdev"
} }
install_mdevd() { install_mdevd() {
@ -151,8 +151,8 @@ install_mdevd() {
install_binary mdevd mdevd-coldplug install_binary mdevd mdevd-coldplug
install -m644 "${filesdir}/mdev.conf" -t "${wrkdir}/etc" install -m644 "${filesdir}/mdev.conf" -t "${workdir}/etc"
install -Dm755 "${filesdir}/storage-device" -t "${wrkdir}/lib/mdev" install -Dm755 "${filesdir}/storage-device" -t "${workdir}/lib/mdev"
} }
install_udev() { install_udev() {
@ -160,7 +160,7 @@ install_udev() {
install_binary udevd udevadm dmsetup install_binary udevd udevadm dmsetup
# FIXME rewrite this piece of crap # FIXME rewrite this piece of crap
find /usr/lib/udev -type f | grep -v "rc_keymaps\|hwdb.d" | cpio -pd "$wrkdir" > /dev/null 2>&1 find /usr/lib/udev -type f | grep -v "rc_keymaps\|hwdb.d" | cpio -pd "$workdir" > /dev/null 2>&1
} }
install_lvm() { install_lvm() {
@ -173,10 +173,10 @@ install_lvm() {
# install lvm config # install lvm config
if [ "$lvm_conf" = 1 ]; then if [ "$lvm_conf" = 1 ]; then
install -Dm644 /etc/lvm/*.conf -t "${wrkdir}/etc/lvm" || msg panic "failed to install LVM config" install -Dm644 /etc/lvm/*.conf -t "${workdir}/etc/lvm" || msg panic "failed to install LVM config"
else else
mkdir "${wrkdir}/etc/lvm" mkdir "${workdir}/etc/lvm"
cat << EOF > "${wrkdir}/etc/lvm/lvm.conf" cat << EOF > "${workdir}/etc/lvm/lvm.conf"
devices { devices {
# block discard support # block discard support
issue_discards = ${lvm_discard:-0} issue_discards = ${lvm_discard:-0}
@ -200,22 +200,22 @@ install_luks() {
# avoid "locking directory missing" warning message and libgcc_s.so.1 missing error # avoid "locking directory missing" warning message and libgcc_s.so.1 missing error
# see https://bugs.archlinux.org/task/56771 # see https://bugs.archlinux.org/task/56771
mkdir "${wrkdir}/run/cryptsetup" mkdir "${workdir}/run/cryptsetup"
[ -e /usr/lib/libgcc_s.so.1 ] && { [ -e /usr/lib/libgcc_s.so.1 ] && {
install -s -m755 /usr/lib/libgcc_s.so.1 -t "${wrkdir}/usr/lib" || install -s -m755 /usr/lib/libgcc_s.so.1 -t "${workdir}/usr/lib" ||
msg panic "failed to install LUKS libraries" msg panic "failed to install LUKS libraries"
} }
# copy luks header # copy luks header
[ -f "$luks_header" ] && { [ -f "$luks_header" ] && {
install -m400 "$luks_header" "${wrkdir}/root/luks_header" || msg panic "failed to copy LUKS header" install -m400 "$luks_header" "${workdir}/root/luks_header" || msg panic "failed to copy LUKS header"
luks_args="--header=/root/luks_header $luks_args" luks_args="--header=/root/luks_header $luks_args"
} }
# copy luks keyfile # copy luks keyfile
[ -f "$luks_keyfile" ] && { [ -f "$luks_keyfile" ] && {
install -m400 "$luks_keyfile" "${wrkdir}/root/luks_keyfile" || msg panic "failed to copy LUKS keyfile" install -m400 "$luks_keyfile" "${workdir}/root/luks_keyfile" || msg panic "failed to copy LUKS keyfile"
luks_args="--key-file=/root/luks_keyfile $luks_args" luks_args="--key-file=/root/luks_keyfile $luks_args"
} }
} }
@ -238,7 +238,7 @@ install_driver() {
cut -d " " -f 2 | cut -d " " -f 2 |
while read -r driver_dep; do while read -r driver_dep; do
install -Dm644 "$driver_dep" "${wrkdir}${driver_dep}" install -Dm644 "$driver_dep" "${workdir}${driver_dep}"
done done
done done
} }
@ -286,8 +286,8 @@ generate_depmod() {
modker="${moddir}/${kernel}" modker="${moddir}/${kernel}"
cp "${modker}/modules.builtin" "${modker}/modules.order" "${wrkdir}${modker}" cp "${modker}/modules.builtin" "${modker}/modules.order" "${workdir}${modker}"
depmod -b "$wrkdir" "$kernel" depmod -b "$workdir" "$kernel"
} }
install_binary() { install_binary() {
@ -304,7 +304,7 @@ install_binary() {
[ "$fullbin" ] || msg panic "$binary doesn't exists" [ "$fullbin" ] || msg panic "$binary doesn't exists"
# install and strip binary # install and strip binary
install -s -m755 "$fullbin" -t "${wrkdir}/usr/bin" install -s -m755 "$fullbin" -t "${workdir}/usr/bin"
# check static # check static
ldd "$fullbin" > /dev/null 2>&1 || continue ldd "$fullbin" > /dev/null 2>&1 || continue
@ -317,7 +317,7 @@ install_binary() {
install_library() { install_library() {
# TODO make strip optional # TODO make strip optional
wrkdirlib="${wrkdir}/usr/lib/" workdirlib="${workdir}/usr/lib/"
# extract paths to libraries from ldd output # extract paths to libraries from ldd output
ldd $(command -v "$1") | ldd $(command -v "$1") |
@ -334,23 +334,23 @@ install_library() {
if [ -h "$library" ]; then if [ -h "$library" ]; then
# check if library already exists # check if library already exists
[ -e "${wrkdirlib}${fulllib##*/}" ] || [ -e "${workdirlib}${fulllib##*/}" ] ||
[ -e "${wrkdirlib}${namelib}" ] || [ -e "${workdirlib}${namelib}" ] ||
{ {
# regular # regular
install -s -m755 "${fulllib}" -t "${wrkdirlib}" install -s -m755 "${fulllib}" -t "${workdirlib}"
# FIXME handle all symlinks # FIXME handle all symlinks
# symlink may link to symlink # symlink may link to symlink
[ -h "/usr/lib/${reallib}" ] && [ -h "/usr/lib/${reallib}" ] &&
cp -a "/usr/lib/${reallib}" "${wrkdirlib}" cp -a "/usr/lib/${reallib}" "${workdirlib}"
# symlink # symlink
cp -a "$library" "${wrkdirlib}" cp -a "$library" "${workdirlib}"
} }
else else
[ -e "${wrkdirlib}${namelib}" ] || [ -e "${workdirlib}${namelib}" ] ||
install -s -m755 "$library" -t "${wrkdirlib}" install -s -m755 "$library" -t "${workdirlib}"
fi fi
done done
} }
@ -358,7 +358,7 @@ install_library() {
install_files() { install_files() {
msg info "installing files" msg info "installing files"
cat << EOF > "${wrkdir}/config" cat << EOF > "${workdir}/config"
debug="$debug" debug="$debug"
init="$init" init="$init"
root="$root" root="$root"
@ -380,9 +380,9 @@ luks_discard="$luks_discard"
luks_args="$luks_args" luks_args="$luks_args"
EOF EOF
install -m644 "${filesdir}/passwd" -t "$wrkdir" install -m644 "${filesdir}/passwd" -t "$workdir"
install -m644 "${filesdir}/group" -t "$wrkdir" install -m644 "${filesdir}/group" -t "$workdir"
install -m755 "${filesdir}/init" -t "$wrkdir" install -m755 "${filesdir}/init" -t "$workdir"
} }
create_initramfs() { create_initramfs() {
@ -393,7 +393,7 @@ create_initramfs() {
{ {
( (
cd "$wrkdir" cd "$workdir"
find . | cpio -oH newc | ${compress:-gzip -9} find . | cpio -oH newc | ${compress:-gzip -9}
) | tee "$initramfs" ) | tee "$initramfs"
@ -412,8 +412,8 @@ parse_conf
: "${filesdir:=$(readlink -f $(dirname "$0"))/files}" : "${filesdir:=$(readlink -f $(dirname "$0"))/files}"
: "${initramfs:=$(readlink -f $(dirname "$0"))/initramfs-${kernel}}" : "${initramfs:=$(readlink -f $(dirname "$0"))/initramfs-${kernel}}"
# remove wrkdir on exit or unexpected error # remove workdir on exit or unexpected error
trap remove_wrkdir EXIT INT trap remove_workdir EXIT INT
[ "$debug" = 1 ] && { [ "$debug" = 1 ] && {
# debug shell commands # debug shell commands
@ -422,7 +422,7 @@ trap remove_wrkdir EXIT INT
trap - EXIT INT trap - EXIT INT
} }
create_wrkdir create_workdir
create_structure create_structure
create_symlinks create_symlinks
install_requirements install_requirements