From 4e7b5ca4b492a72186840677b990b2b543a76900 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 2 Jul 2016 19:12:57 -0300
Subject: Bootless: enhanced bootfde and bootimg configs

---
 share/config/templates/bootless/custom.cfg | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'share/config/templates/bootless/custom.cfg')

diff --git a/share/config/templates/bootless/custom.cfg b/share/config/templates/bootless/custom.cfg
index 5eaf786..87de184 100644
--- a/share/config/templates/bootless/custom.cfg
+++ b/share/config/templates/bootless/custom.cfg
@@ -8,22 +8,19 @@ set menu_color_highlight=yellow/red
 # Example: imagens stored in the USB stick: just put your images under custom/debian/images.
 #
 menuentry 'Example: Darkstar' {
-  set    version=3.16.0-4
-  set    source=/dev/mapper/vg-root
-  set    target=root
-
-	echo	 'Loading AMD64 Debian Desktop (Jessie)...'
-  linux  /boot/custom/debian/vmlinuz-${version}-amd64 root=/dev/mapper/root cryptopts=target=${target},source=${source} ro quiet apparmor=1 security=apparmor
-  echo   'Loading initial ramdisk ...'
-  initrd /boot/custom/debian/initrd.img-${version}-amd64
+  set     volume=/dev/sda5
+  set     version=3.16.0-4-amd64
+  set     target=sda5_crypt
+  set     rootfs=darkstar--vg-root
+  set     distro=debian
+  bootimg ${volume} ${version} ${source} ${target} ${distro}
 }
 
 #
 # Example: Full Disk Encryption: images are loaded from encrypted partition.
 #
 menuentry 'Example: Darkstar FDE' {
-  set machine=darkstar
-  set version=3.16.0-4
-
-  bootfde ${machine} ${version}
+  set     volume=darkstar
+  set     version=3.16.0-4-amd64
+  bootfde ${volume} ${version}
 }
-- 
cgit v1.2.3