cleaning up... it's feeling super complete

extra/pre-build.d/root/pre-build.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+source /etc/bashrc
+source /root/.bashrc
+
 # we need this fix before anything.
 dirmngr </dev/null > /dev/null 2>&1
 

extra/templates/VARS.txt.j2

@@ -4,5 +4,5 @@ export PNAME='{{ bdisk['name'] }}'
 export DISTPUB='{{ bdisk['dev'] }}'
 export DISTDESC='{{ bdisk['desc'] }}'
 export REGUSR='{{ bdisk['name']|lower }}'
-export REGUSR_PASS='{{ bdisk['usr_pass'] }}'
-export ROOT_PASS='{{ bdisk['root_pass'] }}'
+export REGUSR_PASS='{{ user['password'] }}'
+export ROOT_PASS='{{ bdisk['root_password'] }}'

extra/templates/VERSION_INFO.txt.j2

@@ -1,6 +1,6 @@
 Version:        {{ bdisk['ver'] }}
-Build:          {{ build['name'] }}
+Build:          {{ build['buildnum'] }}
 Time:           {{ build['time'] }}
-Machine:        {{ hostname }}
+Machine:        {{ hostname }} ({{ distro }})
 User:           {{ build['user'] }}{% if build['realuser'] is defined and build['realuser'] > 0 %} ({{ build['realuser'] }}){% endif %}