diff options
| -rw-r--r-- | doc/todo.rst | 4 | ||||
| -rw-r--r-- | share/config/templates/bootless/grub.cfg | 29 |
2 files changed, 22 insertions, 11 deletions
diff --git a/doc/todo.rst b/doc/todo.rst index 98431b1..bbe16f6 100644 --- a/doc/todo.rst +++ b/doc/todo.rst @@ -16,4 +16,6 @@ TODO - $APP_BASE/share/{hydra,hydractl} - /usr/local/share/{hydra,hydractl} - {hydra,hydract}-action (like git plugins) -- bootless: per-device hash/verification. +- bootless: + - per-device hash/verification. + - always copy grub.cfg. diff --git a/share/config/templates/bootless/grub.cfg b/share/config/templates/bootless/grub.cfg index 3864c4a..35827db 100644 --- a/share/config/templates/bootless/grub.cfg +++ b/share/config/templates/bootless/grub.cfg @@ -29,11 +29,13 @@ function bootfde { insmod luks insmod lvm - cryptomount lvm/${1} - set root=(crypto0) - set volume=${1} - set version=${2} + + if [ "${2}" ]; then + set version=${2} + else + set version=3.16.0-4-amd64 + fi if [ "${3}" ]; then set source=${3} @@ -47,10 +49,12 @@ function bootfde { set target=root fi - echo "Loading ${volume}..." - linux /boot/vmlinuz-${version} root=/dev/mapper/${target} cryptopts=target=${target},source=${source} ro quiet - echo 'Loading initial ramdisk ...' - initrd /boot/initrd.img-${version} + cryptomount lvm/${volume} + set root=(crypto0) + echo "Loading ${volume}..." + linux /boot/vmlinuz-${version} root=/dev/mapper/${target} cryptopts=target=${target},source=${source} ro quiet + echo 'Loading initial ramdisk ...' + initrd /boot/initrd.img-${version} } # @@ -59,7 +63,12 @@ function bootfde { # function bootimg { set volume=${1} - set version=${2} + + if [ "${2}" ]; then + set version=${2} + else + set version=3.16.0-4-amd64 + fi if [ "${3}" ]; then set target=${3} @@ -79,7 +88,7 @@ function bootimg { set distro=debian fi - echo "Loading ${1}..." + echo "Loading ${1}..." linux /boot/custom/${distro}/vmlinuz-${version} root=/dev/mapper/${rootfs} cryptopts=target=${target},source=${volume} ro quiet apparmor=1 security=apparmor echo 'Loading initial ramdisk ...' initrd /boot/custom/${distro}/initrd.img-${version} |