From 40b1a80102c066d383954ad6a425ef0e8e8fe4b8 Mon Sep 17 00:00:00 2001 From: Kload Date: Mon, 24 Jun 2013 13:15:32 +0000 Subject: [PATCH] Bugfix --- build-yunohost | 8 ++++- profiles/advanced.base_include | 39 ----------------------- profiles/advanced.description | 1 - profiles/advanced.downloads | 39 ----------------------- profiles/advanced.packages | 4 --- profiles/advanced.preseed | 56 ---------------------------------- profiles/advanced.udebs | 2 -- profiles/test.base_include | 39 ----------------------- profiles/test.description | 1 - profiles/test.downloads | 39 ----------------------- profiles/test.packages | 4 --- profiles/test.preseed | 31 ++++++++++++++++--- profiles/test.udebs | 2 -- simple-cdd-amd64-test.conf | 12 -------- 14 files changed, 33 insertions(+), 244 deletions(-) delete mode 100644 profiles/advanced.base_include delete mode 100644 profiles/advanced.description delete mode 100644 profiles/advanced.downloads delete mode 100644 profiles/advanced.packages delete mode 100644 profiles/advanced.preseed delete mode 100644 profiles/advanced.udebs delete mode 100644 profiles/test.base_include delete mode 100644 profiles/test.description delete mode 100644 profiles/test.downloads delete mode 100644 profiles/test.packages delete mode 100644 profiles/test.udebs delete mode 100644 simple-cdd-amd64-test.conf diff --git a/build-yunohost b/build-yunohost index c636e3b..3d5ffbc 100755 --- a/build-yunohost +++ b/build-yunohost @@ -7,6 +7,7 @@ function build-i386 build-simple-cdd --dist wheezy --force-preseed --conf ./simple-cdd-i386.conf $(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 +rm images/debian-7.0-amd64-CD-1.list.gz } function build-amd64 @@ -14,13 +15,18 @@ function build-amd64 build-simple-cdd --dist wheezy --force-preseed --conf ./simple-cdd-amd64.conf $(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 +rm images/debian-7.0-amd64-CD-1.list.gz } function build-amd64-test { -build-simple-cdd --dist wheezy --force-preseed --conf ./simple-cdd-amd64-test.conf +cp profiles/default.preseed profiles/old.default.preseed +cp profiles/test.preseed profiles/default.preseed +build-simple-cdd --dist wheezy --force-preseed --conf ./simple-cdd-amd64.conf $(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 +rm images/debian-7.0-amd64-CD-1.list.gz +mv profiles/old.default.preseed profiles/default.preseed } if [[ "${1:-1}" = 1 ]] diff --git a/profiles/advanced.base_include b/profiles/advanced.base_include deleted file mode 100644 index da49666..0000000 --- a/profiles/advanced.base_include +++ /dev/null @@ -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 diff --git a/profiles/advanced.description b/profiles/advanced.description deleted file mode 100644 index f531b8e..0000000 --- a/profiles/advanced.description +++ /dev/null @@ -1 +0,0 @@ -Y U NO HOST full automatic webservices installer diff --git a/profiles/advanced.downloads b/profiles/advanced.downloads deleted file mode 100644 index da49666..0000000 --- a/profiles/advanced.downloads +++ /dev/null @@ -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 diff --git a/profiles/advanced.packages b/profiles/advanced.packages deleted file mode 100644 index dd11cb0..0000000 --- a/profiles/advanced.packages +++ /dev/null @@ -1,4 +0,0 @@ -# less is more intuituve -less -simple-cdd-profiles -firmware-linux-nonfree diff --git a/profiles/advanced.preseed b/profiles/advanced.preseed deleted file mode 100644 index 1f5c97d..0000000 --- a/profiles/advanced.preseed +++ /dev/null @@ -1,56 +0,0 @@ -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/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 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/advanced.udebs b/profiles/advanced.udebs deleted file mode 100644 index 9fd0035..0000000 --- a/profiles/advanced.udebs +++ /dev/null @@ -1,2 +0,0 @@ -# the udeb needed for simple-cdd -simple-cdd-profiles diff --git a/profiles/test.base_include b/profiles/test.base_include deleted file mode 100644 index da49666..0000000 --- a/profiles/test.base_include +++ /dev/null @@ -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 diff --git a/profiles/test.description b/profiles/test.description deleted file mode 100644 index f531b8e..0000000 --- a/profiles/test.description +++ /dev/null @@ -1 +0,0 @@ -Y U NO HOST full automatic webservices installer diff --git a/profiles/test.downloads b/profiles/test.downloads deleted file mode 100644 index da49666..0000000 --- a/profiles/test.downloads +++ /dev/null @@ -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 diff --git a/profiles/test.packages b/profiles/test.packages deleted file mode 100644 index dd11cb0..0000000 --- a/profiles/test.packages +++ /dev/null @@ -1,4 +0,0 @@ -# less is more intuituve -less -simple-cdd-profiles -firmware-linux-nonfree diff --git a/profiles/test.preseed b/profiles/test.preseed index 06261c5..17cb4d6 100644 --- a/profiles/test.preseed +++ b/profiles/test.preseed @@ -1,19 +1,40 @@ -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/dhcp_options select Configure network manually +d-i netcfg/disable_dhcp boolean false d-i netcfg/get_hostname string yunohost -d-i netcfg/get_domain string mondomaine.fr +d-i netcfg/get_domain string yunohost.org 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 partman-auto/method string regular +d-i partman-auto/choose_recipe select multi +#d-i partman-auto/expert_recipe string \ +# condpart :: \ +# 300 4000 7000 ext3 \ +# $primary{ } $bootable{ } \ +# method{ format } format{ } \ +# use_filesystem{ } filesystem{ ext3 } \ +# mountpoint{ / } \ +# . \ +# 64 512 300% linux-swap \ +# method{ swap } format{ } \ +# . \ +# 100 10000 1000000000 ext3 \ +# method{ keep } format{ } \ +# use_filesystem{ } filesystem{ ext3 } \ +# mountpoint{ /var } \ +# . +d-i partman/confirm_write_new_label boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean false +d-i partman/confirm_nooverwrite boolean true 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 @@ -41,7 +62,7 @@ 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/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 diff --git a/profiles/test.udebs b/profiles/test.udebs deleted file mode 100644 index 9fd0035..0000000 --- a/profiles/test.udebs +++ /dev/null @@ -1,2 +0,0 @@ -# the udeb needed for simple-cdd -simple-cdd-profiles diff --git a/simple-cdd-amd64-test.conf b/simple-cdd-amd64-test.conf deleted file mode 100644 index ff3a497..0000000 --- a/simple-cdd-amd64-test.conf +++ /dev/null @@ -1,12 +0,0 @@ -server="ftp.fr.debian.org" -debian_mirror="ftp://$server/debian/" -rsync_debian_mirror="$server::debian" -profiles="default test" -mirror_components="main contrib non-free" -export ARCH="amd64" -export DISKINFO="YunoHost $(date --utc +%Y%m%d)" -export OMIT_MANUAL=1 -export OMIT_RELEASE_NOTES=1 -export INSTALLER_CD=2 -export DOJIGDO=0 -export SPLASHPNG="`pwd`/extras/splash.png"