[fix] Missing files

add-firmware-to

@@ -99,7 +99,7 @@ if [ -e "$outfile" ]; then
 fi
 
 suite="$3"
-if [ "$suite" != "lenny" ] && [ "$suite" != "squeeze" ]; then
+if [ "$suite" != "stretch" ] && [ "$suite" != "jessie" ]; then
     echo "Unrecognized suite $suite, trying anyway." >&2
 fi
 

build-yunohost

@@ -2,20 +2,20 @@
 
 DATE=$(date +%m%d%y%H%M)
 DIST='jessie'
-DEBNUM='8.0'
+DEBNUM='8.6'
 
 function build-i386
 {
 build-simple-cdd --dist $DIST --force-preseed --conf ./simple-cdd-i386.conf
-$(pwd)/add-firmware-to images/debian-$DEBNUM-i386-CD-1.iso images/yunohostv2-$DATE-i386.iso $DIST
+$(pwd)/add-firmware-to images/debian-$DEBNUM-i386-CD-1.iso images/yunohost-$DATE-i386.iso $DIST
 rm images/debian-$DEBNUM-i386-CD-1.iso
 rm images/debian-$DEBNUM-i386-CD-1.list.gz
 }
 
 function build-amd64
 {
-build-simple-cdd --dist $DIST --force-preseed --conf ./simple-cdd-amd64.conf
+build-simple-cdd --dist $DIST --conf ./simple-cdd-amd64.conf
-$(pwd)/add-firmware-to images/debian-$DEBNUM-amd64-CD-1.iso images/yunohostv2-$DATE-amd64.iso $DIST
+$(pwd)/add-firmware-to images/debian-$DEBNUM-amd64-CD-1.iso images/yunohost-$DATE-amd64.iso $DIST
 #rm images/debian-$DEBNUM-amd64-CD-1.iso
 #rm images/debian-$DEBNUM-amd64-CD-1.list.gz
 }
@@ -25,7 +25,7 @@ function build-amd64-test
 cp profiles/default.preseed profiles/old.default.preseed
 cp profiles/test.preseed profiles/default.preseed
 build-simple-cdd --dist $DIST --force-preseed --conf ./simple-cdd-amd64.conf
-$(pwd)/add-firmware-to images/debian-$DEBNUM-amd64-CD-1.iso images/yunohostv2-$DATE-amd64-test.iso $DIST
+$(pwd)/add-firmware-to images/debian-$DEBNUM-amd64-CD-1.iso images/yunohost-$DATE-amd64-test.iso $DIST
 rm images/debian-$DEBNUM-amd64-CD-1.iso
 rm images/debian-$DEBNUM-amd64-CD-1.list.gz
 mv profiles/old.default.preseed profiles/default.preseed

profiles/advanced.base_include

@@ -1,39 +0,0 @@
-# keep grub or debian-installer may not work properly.
-grub
-
-popularity-contest
-localization-config
-console-tools
-
-usbutils
-acpi
-acpid
-eject
-
-# needed for debian-installer's LVM, software RAID or encrypted disks:
-lvm2
-mdadm
-cryptsetup
-
-# to support reiserfs, JFS and XFS filesystems
-reiserfsprogs
-jfsutils
-xfsprogs
-
-# type-handling tiny package needed for xorg on most architectures
-type-handling
-
-# debian-cd uses debootstrap from the mirror
-debootstrap
-
-# initramfs-tools recommends busybox, and we don't yet support recommends
-busybox
-
-# newer debian-cd (0.3.5+) requires syslinux-common or syslinux in the mirror
-syslinux-common
-syslinux
-
-# add non-free firmware
-firmware-linux-nonfree
-file
-libc6-i386

profiles/advanced.downloads

@@ -1,39 +0,0 @@
-# keep grub or debian-installer may not work properly.
-grub
-
-popularity-contest
-localization-config
-console-tools
-
-usbutils
-acpi
-acpid
-eject
-
-# needed for debian-installer's LVM, software RAID or encrypted disks:
-lvm2
-mdadm
-cryptsetup
-
-# to support reiserfs, JFS and XFS filesystems
-reiserfsprogs
-jfsutils
-xfsprogs
-
-# type-handling tiny package needed for xorg on most architectures
-type-handling
-
-# debian-cd uses debootstrap from the mirror
-debootstrap
-
-# initramfs-tools recommends busybox, and we don't yet support recommends
-busybox
-
-# newer debian-cd (0.3.5+) requires syslinux-common or syslinux in the mirror
-syslinux-common
-syslinux
-
-# add non-free firmware
-firmware-linux-nonfree
-file
-libc6-i386

profiles/advanced.packages

@@ -1,4 +0,0 @@
-# less is more intuituve
-less
-simple-cdd-profiles
-firmware-linux-nonfree

profiles/advanced.preseed

@@ -1,36 +1,55 @@
-d-i netcfg/use_dhcp boolean false
+### Network configuration
 d-i netcfg/choose_interface select auto
-d-i netcfg/disable_dhcp boolean true
 d-i netcfg/dhcp_failed note
-d-i netcfg/get_hostname string yunohost
+d-i netcfg/disable_dhcp boolean true
-d-i netcfg/get_domain string mondomaine.fr
+d-i netcfg/use_dhcp boolean false
-d-i netcfg/get_domain seen true
+#d-i netcfg/get_hostname string yunohost
+#d-i netcfg/get_domain string mondomaine.fr
+#d-i netcfg/get_domain seen true
+
+### Mirror settings
 d-i mirror/country string manual
 d-i mirror/http/hostname string ftp.debian.org
 d-i mirror/http/directory string /debian
 d-i mirror/http/proxy string
 d-i mirror/http/proxy seen false
+
+### Clock and time zone setup
 d-i clock-setup/utc boolean true
 d-i time/zone string Europe/Paris
 d-i clock-setup/ntp boolean true
 d-i clock-setup/ntp-server string 0.fr.pool.ntp.org
+
+### Account setup
 d-i passwd/root-password-crypted password $1$6xBdkGvE$8nLCNRxwABespdFJniEiX0
-d-i passwd/make-user boolean fasle
+d-i passwd/make-user boolean false
+
+### Base system installation
 d-i apt-setup/non-free boolean true
 d-i apt-setup/contrib boolean true
 d-i apt-setup/local0/repository string \
-	http://repo.yunohost.org/ megusta main
+	http://repo.yunohost.org/debian/ jessie stable
-d-i apt-setup/local0/key string http://repo.yunohost.org/yunohost.asc
+d-i apt-setup/local0/key string https://repo.yunohost.org/yunohost.asc
-d-i debian-installer/allow_unauthenticated string true
+#d-i debian-installer/allow_unauthenticated string true
+
+### Package selection
 tasksel tasksel/first multiselect standard, web-server, ssh-server
 d-i pkgsel/include string postfix yunohost
+
+### Deactivate poll on popular packages
 popularity-contest popularity-contest/participate boolean false
 debconf debconf/frontend select Noninteractive
+
+### Boot loader installation
 d-i grub-installer/only_debian boolean true
 d-i grub-installer/with_other_os boolean true
+
+### Finishing up the installation
 d-i finish-install/reboot_in_progress note
 d-i cdrom-detect/eject boolean true
 d-i debian-installer/exit/reboot boolean true
+
+### YunoHost Debconf (same than in yunohost/install_script)
 slapd slapd/password1 password yunohost
 slapd slapd/password2 password yunohost
 slapd slapd/domain string yunohost.org

profiles/advanced.udebs

@@ -1,2 +0,0 @@
-# the udeb needed for simple-cdd
-simple-cdd-profiles

profiles/default.preseed

@@ -52,8 +52,8 @@ d-i apt-setup/non-free boolean true
 d-i apt-setup/contrib boolean true
 d-i apt-setup/local0/repository string \
 	http://repo.yunohost.org/debian/ jessie stable
-d-i apt-setup/local0/key string http://repo.yunohost.org/yunohost.asc
+d-i apt-setup/local0/key string https://repo.yunohost.org/yunohost.asc
-d-i debian-installer/allow_unauthenticated string true
+#d-i debian-installer/allow_unauthenticated string true
 
 ### Package selection
 tasksel tasksel/first multiselect standard, web-server, ssh-server

simple-cdd-amd64.conf

@@ -1,6 +1,7 @@
 server="ftp2.fr.debian.org"
 debian_mirror="http://$server/debian/"
 wget_debian_mirror="ftp://$server/debian"
+profiles="default advanced"
 dist="jessie"
 mirror_components="main contrib non-free"
 export ARCH="amd64"
@@ -9,3 +10,4 @@ export OMIT_MANUAL=1
 export OMIT_RELEASE_NOTES=1
 export INSTALLER_CD=2
 export DOJIGDO=1
+export SPLASHPNG="`pwd`/extras/splash.png"