Changed the makeiso files

makeiso/files/master-template/.disk/base_components

+main

makeiso/files/master-template/.disk/mkisofs

+/home/93sam/xorriso -as mkisofs -r -checksum_algorithm_iso md5,sha1,sha256,sha512 -V 'Debian 8.1.0 amd64 1' -o /org/cdbuilder.debian.org/dst/deb-cd/out/Aamd64/debian-8.1.0-amd64-lxde-CD-1.iso -jigdo-jigdo /org/cdbuilder.debian.org/dst/deb-cd/out/Aamd64/debian-8.1.0-amd64-lxde-CD-1.jigdo -jigdo-template /org/cdbuilder.debian.org/dst/deb-cd/out/Aamd64/debian-8.1.0-amd64-lxde-CD-1.template -jigdo-map Debian=/org/cdbuilder.debian.org/src/ftp/debian/ -jigdo-exclude boot1 -md5-list /org/cdbuilder.debian.org/src/deb-cd/tmp/Aamd64/jessie/md5-check -jigdo-min-file-size 1024 -jigdo-exclude 'README*' -jigdo-exclude /doc/ -jigdo-exclude /md5sum.txt -jigdo-exclude /.disk/ -jigdo-exclude /pics/ -jigdo-exclude 'Release*' -jigdo-exclude 'Packages*' -jigdo-exclude 'Sources*' -J -J -joliet-long -cache-inodes -isohybrid-mbr syslinux/usr/lib/ISOLINUX/isohdpfx.bin -b isolinux/isolinux.bin -c isolinux/boot.cat -boot-load-size 4 -boot-info-table -no-emul-boot -eltorito-alt-boot -e boot/grub/efi.img -no-emul-boot -isohybrid-gpt-basdat -isohybrid-apm-hfsplus boot1 CD1

makeiso/files/master-template/.disk/udeb_include

+ethdetect
+netcfg
+pcmciautils-udeb
+live-installer

makeiso/files/master-template/boot/grub/grub.cfg

-loadfont /EFI/BOOT/font.pf2
-set gfxmode=auto
-insmod efi_gop
-insmod efi_uga
-insmod gfxterm
-terminal_output gfxterm
+if loadfont $prefix/font.pf2 ; then
+  set gfxmode=800x600
+  insmod efi_gop
+  insmod efi_uga
+  insmod video_bochs
+  insmod video_cirrus
+  insmod gfxterm
+  insmod png
+  terminal_output gfxterm
+fi
 
-set menu_color_normal=white/black
-set menu_color_highlight=black/light-gray
+if background_image /isolinux/splash.png; then
+  set color_normal=light-gray/black
+  set color_highlight=white/black
+else
+  set menu_color_normal=cyan/blue
+  set menu_color_highlight=white/blue
+fi
 
-menuentry "Try Hamara GNU/Linux without installing" {
-set gfxpayload=keep
-linux	/casper/vmlinuz  file=/cdrom/preseed/hamara.seed boot=casper quiet splash --
-initrd	/casper/initrd
+set theme=/boot/grub/theme/1
+menuentry 'Install' {
+    set background_color=black
+    linux    /install.amd/vmlinuz desktop=lxde vga=788 --- quiet 
+    initrd   /install.amd/initrd.gz
 }
-
-menuentry "Install Hamara GNU/Linux" {
-set gfxpayload=keep
-linux	/casper/vmlinuz  file=/cdrom/preseed/hamara.seed boot=casper only-ubiquity quiet splash --
-initrd	/casper/initrd
+menuentry 'Graphical install' {
+    set background_color=black
+    linux    /install.amd/vmlinuz desktop=lxde vga=788 --- quiet 
+    initrd   /install.amd/gtk/initrd.gz
 }
-
-menuentry "Check disc for defects" {
-set gfxpayload=keep
-linux	/casper/vmlinuz  boot=casper integrity-check quiet splash --
-initrd	/casper/initrd
+submenu 'Advanced options ...' {
+    set menu_color_normal=cyan/blue
+    set menu_color_highlight=white/blue
+    set theme=/boot/grub/theme/1-1
+    menuentry '... Expert install' {
+        set background_color=black
+        linux    /install.amd/vmlinuz desktop=lxde priority=low vga=788 --- 
+        initrd   /install.amd/initrd.gz
+    }
+    menuentry '... Rescue mode' {
+        set background_color=black
+        linux    /install.amd/vmlinuz vga=788 rescue/enable=true --- quiet 
+        initrd   /install.amd/initrd.gz
+    }
+    menuentry '... Automated install' {
+        set background_color=black
+        linux    /install.amd/vmlinuz desktop=lxde auto=true priority=critical vga=788 --- quiet 
+        initrd   /install.amd/initrd.gz
+    }
+    menuentry '... Graphical expert install' {
+        set background_color=black
+        linux    /install.amd/vmlinuz desktop=lxde priority=low vga=788 --- 
+        initrd   /install.amd/gtk/initrd.gz
+    }
+    menuentry '... Graphical rescue mode' {
+        set background_color=black
+        linux    /install.amd/vmlinuz vga=788 rescue/enable=true --- quiet  
+        initrd   /install.amd/gtk/initrd.gz
+    }
+    menuentry '... Graphical automated install' {
+        set background_color=black
+        linux    /install.amd/vmlinuz desktop=lxde auto=true priority=critical vga=788 --- quiet 
+        initrd   /install.amd/gtk/initrd.gz
+    }
+}
+menuentry 'Install with speech synthesis' {
+    set background_color=black
+    linux    /install.amd/vmlinuz desktop=lxde vga=788 speakup.synth=soft --- quiet 
+    initrd   /install.amd/gtk/initrd.gz
 }

makeiso/files/master-template/boot/grub/loopback.cfg

-menuentry "Try Hamara GNU/Linux without installing" {
-set gfxpayload=keep
-linux	/casper/vmlinuz  file=/cdrom/preseed/hamara.seed boot=casper quiet splash --
-initrd	/casper/initrd
-}
-
-menuentry "Install Hamara GNU/Linux" {
-set gfxpayload=keep
-linux	/casper/vmlinuz  file=/cdrom/preseed/hamara.seed boot=casper only-ubiquity quiet splash --
-initrd	/casper/initrd
-}
-
-menuentry "Check disc for defects" {
-set gfxpayload=keep
-linux	/casper/vmlinuz  boot=casper integrity-check quiet splash --
-initrd	/casper/initrd
-}

makeiso/files/master-template/boot/grub/theme/1

+title-color: "white"
+title-text: "Debian GNU/Linux 8.0.0"
+title-font: "Sans Regular 16"
+desktop-color: "black"
+desktop-image: "/isolinux/splash.png"
+message-color: "white"
+message-bg-color: "black"
+terminal-font: "Sans Regular 12"
+
++ vbox {
+  top = 80
+  left = 45%
+  width = 60%
+  height = 100
+  + hbox {
+    left = 0
+    + label {text = "Debian GNU/Linux UEFI Installer menu" font = "Sans 10" color = "#d3d3d3" align = "left"}
+  }
+}
+
++ boot_menu {
+  left = 18%
+  width = 50%
+  top = 200
+  height = 200
+  item_font = "Sans Regular 12"
+  item_color = #d3d3d3
+  selected_item_color = "white"
+  item_height = 20
+  item_padding = 15
+  item_spacing = 5
+}
+
++ vbox {
+  top = 100%-60
+  left = 10%
+  + hbox {
+    top = 0
+    left = 20%
+    + label {text = "Enter: " font = "Sans 10" color = "white" align = "left"}
+    + label {text = "Select             " font = "Sans 10" color = "#d3d3d3" align = "left"}
+  }
+  + hbox {
+    top = 0
+    left = 20%
+    + label {text = "E:     " font = "Sans 10" color = "white" align = "left"}
+    + label {text = "Edit Selection     " font = "Sans 10" color = "#d3d3d3" align = "left"}
+    + label {text = "           " font = "Sans 10" color = "white" align = "left"}
+    + label {text = "C:     " font = "Sans 10" color = "white" align = "left"}
+    + label {text = "GRUB Command line" font = "Sans 10" color = "#d3d3d3" align = "left"}
+  }  
+}

makeiso/files/master-template/boot/grub/theme/1-1

+title-color: "white"
+title-text: "Debian GNU/Linux 8.0.0"
+title-font: "Sans Regular 16"
+desktop-color: "black"
+desktop-image: "/isolinux/splash.png"
+message-color: "white"
+message-bg-color: "black"
+terminal-font: "Sans Regular 12"
+
++ vbox {
+  top = 80
+  left = 45%
+  width = 60%
+  height = 100
+  + hbox {
+    left = 0
+    + label {text = "Debian GNU/Linux UEFI Installer menu" font = "Sans 10" color = "#d3d3d3" align = "left"}
+  }
+  + hbox {
+    left = 0
+    + label {text = " >" font = "Sans 10" color = "white" align = "left"}
+    + label {text = "Advanced options" font = "Sans 10" color = "#d3d3d3" align = "left"}
+  }
+}
+
++ boot_menu {
+  left = 18%
+  width = 50%
+  top = 200
+  height = 200
+  item_font = "Sans Regular 12"
+  item_color = #d3d3d3
+  selected_item_color = "white"
+  item_height = 20
+  item_padding = 15
+  item_spacing = 5
+}
+
++ vbox {
+  top = 100%-60
+  left = 10%
+  + hbox {
+    top = 0
+    left = 20%
+    + label {text = "Enter: " font = "Sans 10" color = "white" align = "left"}
+    + label {text = "Select             " font = "Sans 10" color = "#d3d3d3" align = "left"}
+    + label {text = "           " font = "Sans 10" color = "white" align = "left"}
+    + label {text = "Esc:   " font = "Sans 10" color = "white" align = "left"}
+    + label {text = "Back up one level  " font = "Sans 10" color = "#d3d3d3" align = "left"}
+  }
+  + hbox {
+    top = 0
+    left = 20%
+    + label {text = "E:     " font = "Sans 10" color = "white" align = "left"}
+    + label {text = "Edit Selection     " font = "Sans 10" color = "#d3d3d3" align = "left"}
+    + label {text = "           " font = "Sans 10" color = "white" align = "left"}
+    + label {text = "C:     " font = "Sans 10" color = "white" align = "left"}
+    + label {text = "GRUB Command line" font = "Sans 10" color = "#d3d3d3" align = "left"}
+  }  
+}

makeiso/files/master-template/boot/grub/x86_64-efi/command.lst

 *acpi: acpi
-*background_image: gfxterm
+*all_functional_test: functional_test
+*background_image: gfxterm_background
 *cat: cat
 *cpuid: cpuid
 *crc: hashsum
 *cryptomount: cryptodisk
 *echo: echo
+*extract_syslinux_entries_configfile: syslinuxcfg
+*extract_syslinux_entries_source: syslinuxcfg
+*file: file
 *functional_test: functional_test
 *gettext: gettext
 *hashsum: hashsum
@@ -27,6 +31,7 @@
 *lspci: lspci
 *md5sum: hashsum
 *menuentry: normal
+*pcidump: pcidump
 *probe: probe
 *read_byte: memrw
 *read_dword: memrw
@@ -41,33 +46,45 @@
 *sha512sum: hashsum
 *sleep: sleep
 *submenu: normal
+*syslinux_configfile: syslinuxcfg
+*syslinux_source: syslinuxcfg
 *terminfo: terminfo
 *test_blockarg: test_blockarg
+*testspeed: testspeed
+*tr: tr
+*trust: verify
+*verify_detached: verify
 *xnu_splash: xnu
 *zfskey: zfscrypt
 .: configfile
 [: test
 appleloader: appleldr
 authenticate: normal
-background_color: gfxterm
+background_color: gfxterm_background
 backtrace: backtrace
 badram: mmap
 blocklist: blocklist
 boot: boot
 break: normal
 cat: minicmd
+cbmemc: cbmemc
 chainloader: chain
 clear: normal
 cmp: cmp
 configfile: configfile
 continue: normal
+coreboot_boottime: cbtime
 cutmem: mmap
 date: date
+distrust: verify
 dump: minicmd
+eval: eval
 exit: minicmd
 export: normal
 extract_entries_configfile: configfile
 extract_entries_source: configfile
+extract_legacy_entries_configfile: legacycfg
+extract_legacy_entries_source: legacycfg
 fakebios: loadbios
 false: true
 fix_video: fixvideo
@@ -75,6 +92,7 @@ fwsetup: efifwsetup
 gptsync: gptsync
 halt: halt
 help: minicmd
+initrd16: linux16
 initrd: linux
 initrdefi: linuxefi
 keymap: keylayouts
@@ -84,20 +102,34 @@ kfreebsd_module_elf: bsd
 knetbsd_module: bsd
 knetbsd_module_elf: bsd
 kopenbsd_ramdisk: bsd
+legacy_check_password: legacycfg
+legacy_configfile: legacycfg
+legacy_initrd: legacycfg
+legacy_initrd_nounzip: legacycfg
+legacy_kernel: legacycfg
+legacy_password: legacycfg
+legacy_source: legacycfg
+linux16: linux16
 linux: linux
 linuxefi: linuxefi
+list_trusted: verify
 loadbios: loadbios
 loadfont: font
+lscoreboot: cbls
+lsefi: lsefi
 lsefimmap: lsefimmap
 lsefisystab: lsefisystab
 lsfonts: font
 lsmmap: lsmmap
 lsmod: minicmd
 lssal: lssal
+macppcbless: macbless
+mactelbless: macbless
 module2: multiboot2
 module: multiboot
 multiboot2: multiboot2
 multiboot: multiboot
+nativedisk: nativedisk
 net_add_addr: net
 net_add_dns: net
 net_add_route: net

makeiso/files/master-template/boot/grub/x86_64-efi/crypto.lst

@@ -7,34 +7,39 @@ AES-192: gcry_rijndael
 AES-256: gcry_rijndael
 ADLER32: adler32
 CRC64: crc64
-TIGER192: gcry_tiger
-RIPEMD160: gcry_rmd160
+ARCFOUR: gcry_arcfour
+BLOWFISH: gcry_blowfish
+CAMELLIA128: gcry_camellia
+CAMELLIA192: gcry_camellia
+CAMELLIA256: gcry_camellia
 CAST5: gcry_cast5
-RFC2268_40: gcry_rfc2268
+CRC32: gcry_crc
+CRC32RFC1510: gcry_crc
+CRC24RFC2440: gcry_crc
 DES: gcry_des
 3DES: gcry_des
-SERPENT128: gcry_serpent
-SERPENT192: gcry_serpent
-SERPENT256: gcry_serpent
+DSA: gcry_dsa
+IDEA: gcry_idea
+MD4: gcry_md4
+MD5: gcry_md5
+RFC2268_40: gcry_rfc2268
 AES: gcry_rijndael
 AES192: gcry_rijndael
 AES256: gcry_rijndael
-MD5: gcry_md5
-CAMELLIA128: gcry_camellia
-CAMELLIA192: gcry_camellia
-CAMELLIA256: gcry_camellia
-SHA512: gcry_sha512
-SHA384: gcry_sha512
-SHA1: gcry_sha1
+RIPEMD160: gcry_rmd160
+RSA: gcry_rsa
 SEED: gcry_seed
-ARCFOUR: gcry_arcfour
+SERPENT128: gcry_serpent
+SERPENT192: gcry_serpent
+SERPENT256: gcry_serpent
+SHA1: gcry_sha1
 SHA224: gcry_sha256
 SHA256: gcry_sha256
+SHA512: gcry_sha512
+SHA384: gcry_sha512
+TIGER192: gcry_tiger
+TIGER: gcry_tiger
+TIGER2: gcry_tiger
 TWOFISH: gcry_twofish
 TWOFISH128: gcry_twofish
-CRC32: gcry_crc
-CRC32RFC1510: gcry_crc
-CRC24RFC2440: gcry_crc
-MD4: gcry_md4
 WHIRLPOOL: gcry_whirlpool
-BLOWFISH: gcry_blowfish

makeiso/files/master-template/boot/grub/x86_64-efi/fs.lst

@@ -2,6 +2,7 @@ affs
 afs
 bfs
 btrfs
+cbfs
 cpio
 cpio_be
 exfat
@@ -21,6 +22,7 @@ newc
 nilfs2
 ntfs
 odc
+procfs
 reiserfs
 romfs
 sfs
@@ -28,6 +30,7 @@ squash4
 tar
 udf
 ufs1
+ufs1_be
 ufs2
 xfs
 zfs

makeiso/files/master-template/boot/grub/x86_64-efi/grub.cfg

@@ -2,10 +2,11 @@ insmod part_acorn
 insmod part_amiga
 insmod part_apple
 insmod part_bsd
+insmod part_dfly
 insmod part_dvh
 insmod part_gpt
 insmod part_msdos
 insmod part_plan
 insmod part_sun
 insmod part_sunpc
-configfile /boot/grub/grub.cfg
+source /boot/grub/grub.cfg