mirror of
https://github.com/YunoHost/cd_build.git
synced 2024-09-03 20:06:24 +02:00
Bugfix
This commit is contained in:
Kload
parent
839ddca954
commit
40b1a80102
14 changed files with 33 additions and 244 deletions
|
|
@ -7,6 +7,7 @@ function build-i386
|
||||||
build-simple-cdd --dist wheezy --force-preseed --conf ./simple-cdd-i386.conf
|
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
|
$(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-i386-CD-1.iso
|
||||||
|
rm images/debian-7.0-amd64-CD-1.list.gz
|
||||||
}
|
}
|
||||||
|
|
||||||
function build-amd64
|
function build-amd64
|
||||||
|
|
@ -14,13 +15,18 @@ function build-amd64
|
||||||
build-simple-cdd --dist wheezy --force-preseed --conf ./simple-cdd-amd64.conf
|
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
|
$(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.iso
|
||||||
|
rm images/debian-7.0-amd64-CD-1.list.gz
|
||||||
}
|
}
|
||||||
|
|
||||||
function build-amd64-test
|
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
|
$(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.iso
|
||||||
|
rm images/debian-7.0-amd64-CD-1.list.gz
|
||||||
|
mv profiles/old.default.preseed profiles/default.preseed
|
||||||
}
|
}
|
||||||
|
|
||||||
if [[ "${1:-1}" = 1 ]]
|
if [[ "${1:-1}" = 1 ]]
|
||||||
|
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
Y U NO HOST full automatic webservices installer
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
# less is more intuituve
|
|
||||||
less
|
|
||||||
simple-cdd-profiles
|
|
||||||
firmware-linux-nonfree
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
# the udeb needed for simple-cdd
|
|
||||||
simple-cdd-profiles
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
Y U NO HOST full automatic webservices installer
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
# less is more intuituve
|
|
||||||
less
|
|
||||||
simple-cdd-profiles
|
|
||||||
firmware-linux-nonfree
|
|
||||||
|
|
@ -1,19 +1,40 @@
|
||||||
d-i netcfg/use_dhcp false
|
|
||||||
d-i netcfg/choose_interface select auto
|
d-i netcfg/choose_interface select auto
|
||||||
d-i netcfg/disable_dhcp boolean true
|
|
||||||
d-i netcfg/dhcp_failed note
|
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_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 netcfg/get_domain seen true
|
||||||
d-i mirror/country string manual
|
d-i mirror/country string manual
|
||||||
d-i mirror/http/hostname string ftp.debian.org
|
d-i mirror/http/hostname string ftp.debian.org
|
||||||
d-i mirror/http/directory string /debian
|
d-i mirror/http/directory string /debian
|
||||||
d-i mirror/http/proxy string
|
d-i mirror/http/proxy string
|
||||||
d-i mirror/http/proxy seen false
|
|
||||||
d-i clock-setup/utc boolean true
|
d-i clock-setup/utc boolean true
|
||||||
d-i time/zone string Europe/Paris
|
d-i time/zone string Europe/Paris
|
||||||
d-i clock-setup/ntp boolean true
|
d-i clock-setup/ntp boolean true
|
||||||
d-i clock-setup/ntp-server string 3.fr.pool.ntp.org
|
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/root-password-crypted password $1$6xBdkGvE$8nLCNRxwABespdFJniEiX0
|
||||||
d-i passwd/make-user boolean fasle
|
d-i passwd/make-user boolean fasle
|
||||||
d-i apt-setup/non-free boolean true
|
d-i apt-setup/non-free boolean true
|
||||||
|
|
@ -41,7 +62,7 @@ slapd slapd/domain string yunohost.org
|
||||||
slapd shared/organization string yunohost
|
slapd shared/organization string yunohost
|
||||||
slapd slapd/password1 password yunohost
|
slapd slapd/password1 password yunohost
|
||||||
slapd slapd/password2 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
|
postfix postfix/mailname string /etc/mailname
|
||||||
mysql-server-5.5 mysql-server/root_password password yunohost
|
mysql-server-5.5 mysql-server/root_password password yunohost
|
||||||
mysql-server-5.5 mysql-server/root_password_again password yunohost
|
mysql-server-5.5 mysql-server/root_password_again password yunohost
|
||||||
|
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
# the udeb needed for simple-cdd
|
|
||||||
simple-cdd-profiles
|
|
||||||
|
|
@ -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"
|
|
||||||
Loading…
Add table
Reference in a new issue