diff --git a/README.md b/README.md index 519f280..9c8376d 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Installation ``` wget http://build.yunohost.org/simple-cdd_0.3.14_all.deb sudo dpkg -i simple-cdd_0.3.14_all.deb -sudo apt-get install -f genisoimage +sudo apt-get install -f genisoimage qemu-kvm git clone git://github.com/YunoHost/cd_build.git ``` diff --git a/build-yunohost b/build-yunohost index 81527d3..fd8febb 100755 --- a/build-yunohost +++ b/build-yunohost @@ -8,7 +8,7 @@ function build-i386 { cd $BUILD build-simple-cdd --dist wheezy --force-preseed --conf ./simple-cdd-i386.conf -add-firmware-to images/debian-7.0-i386-CD-1.iso images/yunohostv2-$DATE-i386.iso wheezy +$(pwd)/add-firmware-to images/debian-7.0-i386-CD-1.iso images/yunohostv2-$DATE-i386.iso wheezy rm images/debian-7.0-i386-CD-1.iso } @@ -16,7 +16,7 @@ function build-amd64 { cd $BUILD2 build-simple-cdd --dist wheezy --force-preseed --conf ./simple-cdd-amd64.conf -add-firmware-to images/debian-7.0-amd64-CD-1.iso images/yunohostv2-$DATE-amd64.iso wheezy +$(pwd)/add-firmware-to images/debian-7.0-amd64-CD-1.iso images/yunohostv2-$DATE-amd64.iso wheezy rm images/debian-7.0-amd64-CD-1.iso } @@ -24,7 +24,7 @@ function build-amd64-test { cd $BUILD2 build-simple-cdd --dist wheezy --force-preseed --conf ./simple-cdd-amd64-test.conf -add-firmware-to images/debian-7.0-amd64-CD-1.iso images/yunohostv2-$DATE-amd64-test.iso wheezy +$(pwd)/add-firmware-to images/debian-7.0-amd64-CD-1.iso images/yunohostv2-$DATE-amd64-test.iso wheezy rm images/debian-7.0-amd64-CD-1.iso } diff --git a/profiles/test.base_include b/profiles/test.base_include new file mode 100644 index 0000000..da49666 --- /dev/null +++ b/profiles/test.base_include @@ -0,0 +1,39 @@ +# 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 diff --git a/profiles/test.description b/profiles/test.description new file mode 100644 index 0000000..f531b8e --- /dev/null +++ b/profiles/test.description @@ -0,0 +1 @@ +Y U NO HOST full automatic webservices installer diff --git a/profiles/test.downloads b/profiles/test.downloads new file mode 100644 index 0000000..da49666 --- /dev/null +++ b/profiles/test.downloads @@ -0,0 +1,39 @@ +# 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 diff --git a/profiles/test.packages b/profiles/test.packages new file mode 100644 index 0000000..dd11cb0 --- /dev/null +++ b/profiles/test.packages @@ -0,0 +1,4 @@ +# less is more intuituve +less +simple-cdd-profiles +firmware-linux-nonfree diff --git a/profiles/test.preseed b/profiles/test.preseed index dcd903d..06261c5 100644 --- a/profiles/test.preseed +++ b/profiles/test.preseed @@ -1,3 +1,59 @@ +d-i netcfg/use_dhcp false +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/get_domain string mondomaine.fr +d-i netcfg/get_domain seen true +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 +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 3.fr.pool.ntp.org +d-i passwd/root-password-crypted password $1$6xBdkGvE$8nLCNRxwABespdFJniEiX0 +d-i passwd/make-user boolean fasle +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/ lemonldap main +d-i apt-setup/local1/repository string \ + http://repo.yunohost.org/ megusta main d-i apt-setup/local2/repository string \ http://repo.yunohost.org/ test main +d-i apt-setup/local0/key string http://lemonldap-ng.org/_media/rpm-gpg-key-ow2 +d-i apt-setup/local1/key string http://repo.yunohost.org/yunohost.asc d-i apt-setup/local2/key string http://repo.yunohost.org/yunohost.asc +d-i debian-installer/allow_unauthenticated string true +tasksel tasksel/first multiselect standard, web-server, ssh-server +d-i pkgsel/include postfix yunohost +popularity-contest popularity-contest/participate boolean false +debconf debconf/frontend select Noninteractive +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean true +d-i finish-install/reboot_in_progress note +d-i cdrom-detect/eject boolean true +d-i debian-installer/exit/reboot boolean true +slapd slapd/domain string yunohost.org +slapd shared/organization string yunohost +slapd slapd/password1 password yunohost +slapd slapd/password2 password yunohost +postfix postfix/main_mailer_type select Internet Site +postfix postfix/mailname string /etc/mailname +mysql-server-5.5 mysql-server/root_password password yunohost +mysql-server-5.5 mysql-server/root_password_again password yunohost +samba-common samba-common/workgroup string WORKGROUP +samba-common samba-common/workgroup boolean true +nslcd nslcd/ldap-bindpw password +nslcd nslcd/ldap-starttls boolean false +nslcd nslcd/ldap-reqcert select +nslcd nslcd/ldap-uris string ldap://localhost/ +nslcd nslcd/ldap-binddn string +nslcd nslcd/ldap-base string dc=yunohost,dc=org +proftpd-basic shared/proftpd/inetd_or_standalone select standalone +iptables-persistent iptables-persistent/autosave_v6 boolean false +iptables-persistent iptables-persistent/autosave_v4 boolean false +libnss-ldapd libnss-ldapd/nsswitch multiselect group, passwd, shadow diff --git a/profiles/test.udebs b/profiles/test.udebs new file mode 100644 index 0000000..9fd0035 --- /dev/null +++ b/profiles/test.udebs @@ -0,0 +1,2 @@ +# the udeb needed for simple-cdd +simple-cdd-profiles diff --git a/simple-cdd-amd64-test.conf b/simple-cdd-amd64-test.conf index 680d3a8..ff3a497 100644 --- a/simple-cdd-amd64-test.conf +++ b/simple-cdd-amd64-test.conf @@ -1,7 +1,7 @@ server="ftp.fr.debian.org" debian_mirror="ftp://$server/debian/" rsync_debian_mirror="$server::debian" -profiles="default test advanced" +profiles="default test" mirror_components="main contrib non-free" export ARCH="amd64" export DISKINFO="YunoHost $(date --utc +%Y%m%d)"