diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-02 21:25:54 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-02 21:25:54 -0300 |
| commit | 8b9ddc7fec12ba69e50ece961525c90bed96df99 (patch) | |
| tree | fc12914f9d27317b3d3f1df6f0009f02ebb7668a /core/cryptsetup/encrypt_install | |
| parent | 40134114ddb57a36863a256ffdc5b65a8edb5a67 (diff) | |
| parent | d915cad658736d96368750201c34df752048751a (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/perl-berkeleydb/PKGBUILD
community/egoboo/PKGBUILD
community/kdenlive/PKGBUILD
community/postgis/PKGBUILD
core/lvm2/PKGBUILD
extra/gvfs/PKGBUILD
extra/libatasmart/PKGBUILD
extra/mesa/PKGBUILD
extra/pixman/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/system-config-printer/PKGBUILD
extra/xorg-server/PKGBUILD
kde-unstable/kdenetwork/PKGBUILD
multilib/lib32-mesa/PKGBUILD
testing/imagemagick/PKGBUILD
testing/php/PKGBUILD
testing/php/logrotate.d.php-fpm
testing/php/php-fpm.conf.in.patch
testing/php/rc.d.php-fpm
testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'core/cryptsetup/encrypt_install')
| -rw-r--r-- | core/cryptsetup/encrypt_install | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/core/cryptsetup/encrypt_install b/core/cryptsetup/encrypt_install index 79d2f3e4b..38e5ddc57 100644 --- a/core/cryptsetup/encrypt_install +++ b/core/cryptsetup/encrypt_install @@ -1,13 +1,16 @@ #!/bin/bash build() { - if [ -z "${CRYPTO_MODULES}" ]; then - MODULES=" dm-crypt $(all_modules "/crypto/")" + local mod + + add_module dm-crypt + if [[ $CRYPTO_MODULES ]]; then + for mod in $CRYPTO_MODULES; do + add_module "$mod" + done else - MODULES=" dm-crypt $CRYPTO_MODULES" + add_all_modules '/crypto/' fi - FILES="" - SCRIPT="encrypt" add_binary "cryptsetup" add_binary "dmsetup" @@ -15,10 +18,12 @@ build() { add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules" + + add_runscript } help() { - cat <<HELPEOF + cat <<HELPEOF This hook allows for an encrypted root device. Users should specify the device to be unlocked using 'cryptdevice=device:dmname' on the kernel command line, where 'device' is the path to the raw device, and 'dmname' is the name given to |