From 716aef47eecf479be65843c808bc6fd7c84020cf Mon Sep 17 00:00:00 2001 From: illiliti Date: Sun, 2 Feb 2020 16:10:43 +0300 Subject: [PATCH] improve naming --- generate | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/generate b/generate index 3ee3efa..7b4883a 100755 --- a/generate +++ b/generate @@ -68,27 +68,27 @@ create_symlinks() { #} # install mdev -use_mdev() { +install_mdev() { install -m644 mdev.conf -t "${tmpdir}/etc" install -Dm755 storage-device -t "${tmpdir}/lib/mdev" } # install mdevd -use_mdevd() { +install_mdevd() { install_binaries mdevd mdevd-coldplug install -m644 mdev.conf -t "${tmpdir}/etc" install -Dm755 storage-device -t "${tmpdir}/lib/mdev" } # install udev -use_udev() { +install_udev() { install_binaries udevd udevadm dmsetup # FIXME rewrite this piece of crap find /usr/lib/udev -type f | grep -v "rc_keymaps\|hwdb.d" | cpio -pd "$tmpdir" >/dev/null 2>&1 } # handle lvm -use_lvm() { +install_lvm() { install_binaries lvm # FIXME this code doesn't working with udev #mkdir "$tmpdir/etc/lvm" @@ -103,7 +103,7 @@ use_lvm() { } # handle luks -use_luks() { +install_luks() { install_binaries cryptsetup # avoid locking directory missing warning message @@ -282,14 +282,14 @@ install_files # handle device manager case "$devmgr" in - mdev) use_mdev ;; - mdevd) use_mdevd ;; - udev) use_udev ;; + mdev) install_mdev ;; + mdevd) install_mdevd ;; + udev) install_udev ;; *) panic "devmgr option broken" ;; esac -[ "$use_luks" = 1 ] && use_luks -[ "$use_lvm" = 1 ] && use_lvm +[ "$use_luks" = 1 ] && install_luks +[ "$use_lvm" = 1 ] && install_lvm create_initramfs