lapatatedouce/custom-debian-iso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop expert install, it was broken and not much difference with the regular install now that we ask confirm before formatting disk

Browse Source
This commit is contained in:
Alexandre Aubin
2024-12-20 00:46:28 +01:00
parent ca33b34cec
commit 588d901ca7
3 changed files with 13 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
files_to_inject/boot/grub/grub.cfg
View File

@@ -30,69 +30,28 @@ fi
insmod play insmod play
play 960 440 1 0 4 440 1 play 960 440 1 0 4 440 1
set theme=/boot/grub/theme/yunohost set theme=/boot/grub/theme/yunohost
menuentry --hotkey=g 'Graphical install' { menuentry --hotkey=g 'Graphical install (recommended)' {
set background_color=black set background_color=black
linux /install.amd/vmlinuz preseed/file=/cdrom/preseeds/default.preseed vga=788 --- quiet linux /install.amd/vmlinuz preseed/file=/cdrom/preseeds/default.preseed vga=788 --- quiet
initrd /install.amd/gtk/initrd.gz initrd /install.amd/gtk/initrd.gz
} }
menuentry --hotkey=i 'Install' { menuentry --hotkey=i 'Install' {
set background_color=black set background_color=black
linux /install.amd/vmlinuz preseed/file=/cdrom/preseeds/default.preseed vga=788 --- quiet linux /install.amd/vmlinuz preseed/file=/cdrom/preseeds/default.preseed vga=788 --- quiet
initrd /install.amd/initrd.gz initrd /install.amd/initrd.gz
} }
menuentry --hotkey=s 'Install with speech synthesis' { menuentry --hotkey=s 'Graphical install with speech synthesis' {
set background_color=black set background_color=black
linux /install.amd/vmlinuz preseed/file=/cdrom/preseeds/default.preseed vga=788 speakup.synth=soft --- quiet linux /install.amd/vmlinuz preseed/file=/cdrom/preseeds/default.preseed vga=788 speakup.synth=soft --- quiet
initrd /install.amd/gtk/initrd.gz initrd /install.amd/gtk/initrd.gz
} }
submenu --hotkey=a 'Advanced options ...' { menuentry --hotkey=d 'Graphical install with accessible dark contrast' {
set menu_color_normal=cyan/blue set background_color=black
set menu_color_highlight=white/blue linux /install.amd/vmlinuz preseed/file=/cdrom/preseeds/default.preseed vga=788 theme=dark --- quiet
set theme=/boot/grub/theme/yunohost initrd /install.amd/gtk/initrd.gz
set gfxpayload=keep
menuentry '... Graphical expert install' {
set background_color=black
linux /install.amd/vmlinuz preseed/file=/cdrom/preseeds/expert.preseed priority=low vga=788 ---
initrd /install.amd/gtk/initrd.gz
}
menuentry --hotkey=x '... Expert install' {
set background_color=black
linux /install.amd/vmlinuz preseed/file=/cdrom/preseeds/expert.preseed priority=low vga=788 ---
initrd /install.amd/initrd.gz
}
menuentry --hotkey=w '... Expert install with speech-enabled' {
set background_color=black
linux /install.amd/vmlinuz preseed/file=/cdrom/preseeds/expert.preseed priority=low vga=788 speakup.synth=soft ---
initrd /install.amd/gtk/initrd.gz
}
} }
submenu --hotkey=d 'Accessible dark contrast installer menu ...' { menuentry --hotkey=k 'Install with accessible dark contrast' {
set menu_color_normal=white/black set background_color=black
set menu_color_highlight=yellow/black linux /install.amd/vmlinuz preseed/file=/cdrom/preseeds/default.preseed vga=788 theme=dark --- quiet
set color_normal=white/black initrd /install.amd/initrd.gz
set color_highlight=yellow/black
background_image
set theme=/boot/grub/theme/yunohost
set gfxpayload=keep
menuentry --hotkey=g '... Graphical install' {
set background_color=black
linux /install.amd/vmlinuz preseed/file=/cdrom/preseeds/default.preseed vga=788 theme=dark --- quiet
initrd /install.amd/gtk/initrd.gz
}
menuentry --hotkey=i '... Install' {
set background_color=black
linux /install.amd/vmlinuz preseed/file=/cdrom/preseeds/default.preseed vga=788 theme=dark --- quiet
initrd /install.amd/initrd.gz
}
menuentry '... Graphical expert install' {
set background_color=black
linux /install.amd/vmlinuz preseed/file=/cdrom/preseeds/expert.preseed priority=low vga=788 theme=dark ---
initrd /install.amd/gtk/initrd.gz
}
menuentry --hotkey=x '... Expert install' {
set background_color=black
linux /install.amd/vmlinuz preseed/file=/cdrom/preseeds/expert.preseed priority=low vga=788 theme=dark ---
initrd /install.amd/initrd.gz
}
} }

8
files_to_inject/isolinux/menu.cfg
View File

@@ -27,11 +27,3 @@ label installgui
menu default menu default
kernel /install.__ARCH__/vmlinuz kernel /install.__ARCH__/vmlinuz
append preseed/file=/cdrom/preseeds/default.preseed video=vesa:ywrap,mtrr vga=788 initrd=/install.__ARCH__/gtk/initrd.gz -- quiet append preseed/file=/cdrom/preseeds/default.preseed video=vesa:ywrap,mtrr vga=788 initrd=/install.__ARCH__/gtk/initrd.gz -- quiet
label expert
menu label Expert text install
kernel /install.__ARCH__/vmlinuz
append preseed/file=/cdrom/preseeds/expert.preseed vga=788 initrd=/install.__ARCH__/initrd.gz -- quiet
label expertgui
menu label Expert graphical install
kernel /install.__ARCH__/vmlinuz
append preseed/file=/cdrom/preseeds/expert.preseed video=vesa:ywrap,mtrr vga=788 initrd=/install.__ARCH__/gtk/initrd.gz -- quiet

133
files_to_inject/preseeds/expert.preseed
View File

@@ -1,133 +0,0 @@
### Network configuration
d-i netcfg/choose_interface select auto
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 yunohost.org
### 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
### Localization
d-i tzdata/Areas select Europe
d-i localechooser/continentlist select Europe
d-i time/zone string Europe/Paris
d-i time/zone seen false
d-i clock-setup/utc boolean true
d-i clock-setup/ntp boolean true
d-i clock-setup/ntp-server string 0.fr.pool.ntp.org
### Partitioning
d-i partman-auto/method string lvm
d-i partman-lvm/device_remove_lvm boolean true
d-i partman-md/device_remove_md boolean true
d-i partman-auto/choose_recipe select atomic
d-i partman-lvm/device_remove_lvm_span boolean true
d-i partman-auto/purge_lvm_from_device boolean true
d-i partman-auto-lvm/new_vg_name string system
d-i partman-lvm/confirm boolean true
d-i partman-auto-lvm/guided_size string max
d-i partman-auto/expert_recipe string \
boot-root :: \
128 256 256 ext4 \
$primary{ } \
$bootable{ } \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /boot } \
. \
512 1024 1024 linux-swap \
$lvmok{ } \
lv_name{ swap } \
method{ swap } format{ } \
. \
4096 4096 1000000000 ext4 \
$lvmok{ } \
lv_name{ root } \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ / } \
.
d-i partman/confirm_write_new_label boolean true
#d-i partman/choose_partition select finish
d-i partman/confirm boolean true
d-i partman/confirm_nooverwrite boolean true
d-i partman-lvm/confirm_nooverwrite boolean true
### Account setup
d-i passwd/root-password-crypted password $1$6xBdkGvE$8nLCNRxwABespdFJniEiX0
d-i passwd/make-user boolean false
### Base system installation
d-i apt-setup/non-free boolean false
d-i apt-setup/contrib boolean true
d-i apt-setup/services-select multiselect security, updates
d-i apt-setup/security_host string security.debian.org
d-i apt-setup/local0/repository string \
http://forge.yunohost.org/debian/ __DIST__ stable __TESTING__
d-i apt-setup/local0/key string http://forge.yunohost.org/yunohost___DIST__.asc
d-i apt-setup/local0/comment string YunoHost repository
#d-i debian-installer/allow_unauthenticated string true
# Skip "scan another CD/DVD"
# https://unix.stackexchange.com/a/409237
apt-cdrom-setup apt-setup/cdrom/set-next boolean false
d-i apt-setup/cdrom/set-first boolean false
d-i apt-setup/cdrom/set-next boolean false
d-i apt-setup/cdrom/set-failed boolean false
### Package selection
tasksel tasksel/first multiselect standard, ssh-server
# Keep postfix in here, otherwise exim4 might get installed and create a weird
# conflict...
d-i pkgsel/include string postfix yunohost yunohost-admin
d-i pkgsel/upgrade select none
### 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
#d-i grub-installer/bootdev string default
### 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
slapd shared/organization string yunohost.org
slapd slapd/allow_ldap_v2 boolean false
slapd slapd/invalid_config boolean true
slapd slapd/backend select MDB
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
mariadb-server-10.0 mysql-server/root_password password yunohost
mariadb-server-10.0 mysql-server/root_password_again password yunohost
nslcd nslcd/ldap-bindpw password
nslc 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
libnss-ldapd libnss-ldapd/nsswitch multiselect group, passwd, shadow
postsrsd postsrsd/domain string yunohost.org
### Avoid circular dependencies error
d-i preseed/early_command string apt-install debhelper || true