From 709677e574841a9a334815561cf359b8d0c52276 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Sat, 18 Apr 2020 17:30:43 +0200 Subject: [PATCH 1/4] Verify presence of mcopy for bio key creation --- init.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/init.sh b/init.sh index 9214a3a..40f3463 100755 --- a/init.sh +++ b/init.sh @@ -16,15 +16,18 @@ boot_type="efi64" repo_dir="repo" tmp_dir="tmp" current_dir=`pwd` + # In Archlinux, this is default files for syslinux... conf_file="conf/archlinux.conf" key_mountpoint="/mnt/usbstick" device="" + # constant APP_NAME="Debian USB Creator" VERSION="1.99.0" SYSLINUX_EXE=$(which syslinux) PARTED_EXE=$(which parted) +MCOPY=$(which mcopy) SYSLINUX_FILES="menu.c32 vesamenu.c32 libutil.c32 libcom32.c32" SYSLINUX_BIOS_FILES="" SYSLINUX_EFI_FILES="ldlinux.e64" @@ -225,6 +228,12 @@ then exit 1 fi +if [ "$boot_type" == "bios" ] && [ -z "$MCOPY" ] +then + printf "Bios key creation need mcopy from mtools packages\n" + exit 1 +fi + bootfiles_Debian="http://ftp.debian.org/debian/dists/stable/main/installer-${debian_arch}/current/images/hd-media" if [ $archive -eq 1 ] then From 6421736a19356aebdd1d239a4b7dd3a7bc3f9953 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Sat, 18 Apr 2020 17:34:22 +0200 Subject: [PATCH 2/4] Replace with --- init.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/init.sh b/init.sh index 40f3463..55354bc 100755 --- a/init.sh +++ b/init.sh @@ -25,9 +25,9 @@ device="" # constant APP_NAME="Debian USB Creator" VERSION="1.99.0" -SYSLINUX_EXE=$(which syslinux) -PARTED_EXE=$(which parted) -MCOPY=$(which mcopy) +SYSLINUX_EXE=$(command -v syslinux) +PARTED_EXE=$(command -v parted) +MCOPY=$(command -v mtoos) SYSLINUX_FILES="menu.c32 vesamenu.c32 libutil.c32 libcom32.c32" SYSLINUX_BIOS_FILES="" SYSLINUX_EFI_FILES="ldlinux.e64" From 7d2e62f9a3edff4d1e8b8a4d1be00da510a0c87d Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Tue, 12 May 2020 10:12:58 +0200 Subject: [PATCH 3/4] mcopy command correction --- init.sh | 2 +- preseeds/preseed_swap.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/init.sh b/init.sh index 55354bc..1e85480 100755 --- a/init.sh +++ b/init.sh @@ -27,7 +27,7 @@ APP_NAME="Debian USB Creator" VERSION="1.99.0" SYSLINUX_EXE=$(command -v syslinux) PARTED_EXE=$(command -v parted) -MCOPY=$(command -v mtoos) +MCOPY=$(command -v mcopy) SYSLINUX_FILES="menu.c32 vesamenu.c32 libutil.c32 libcom32.c32" SYSLINUX_BIOS_FILES="" SYSLINUX_EFI_FILES="ldlinux.e64" diff --git a/preseeds/preseed_swap.cfg b/preseeds/preseed_swap.cfg index 5fa1106..d55e0c8 100644 --- a/preseeds/preseed_swap.cfg +++ b/preseeds/preseed_swap.cfg @@ -1,6 +1,6 @@ d-i debian-installer/locale string fr_FR d-i keyboard-configuration/xkb-keymap select fr(latin9) -d-i netcfg/choose_interface select eth0 +#d-i netcfg/choose_interface select eth0 d-i netcfg/get_hostname string unassigned-hostname d-i netcfg/get_domain string unassigned-domain From 5f784ba51431ab198802ce9f024e3d5dfbf6d2ab Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Wed, 22 Jul 2020 14:08:34 +0200 Subject: [PATCH 4/4] Update packages management --- preseeds/preseed.cfg | 9 ++++++++- preseeds/preseed_swap.cfg | 7 +++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/preseeds/preseed.cfg b/preseeds/preseed.cfg index 310b2af..4c76fc8 100644 --- a/preseeds/preseed.cfg +++ b/preseeds/preseed.cfg @@ -1,6 +1,6 @@ d-i debian-installer/locale string fr_FR d-i keyboard-configuration/xkb-keymap select fr(latin9) -d-i netcfg/choose_interface select eth0 +# d-i netcfg/choose_interface select eth0 d-i netcfg/get_hostname string unassigned-hostname d-i netcfg/get_domain string unassigned-domain @@ -12,6 +12,12 @@ d-i mirror/http/hostname string ftp.fr.debian.org d-i mirror/http/directory string /debian d-i mirror/http/proxy string +# +# REPOS +# +d-i apt-setup/contrib boolean true +d-i apt-setup/non-free boolean true + # # USER ACCOUNT # @@ -48,6 +54,7 @@ d-i partman/confirm_nooverwrite boolean true # PACKAGES # tasksel tasksel/first multiselect none +d-i pkgsel/include string git # # GRUB diff --git a/preseeds/preseed_swap.cfg b/preseeds/preseed_swap.cfg index d55e0c8..e78e78b 100644 --- a/preseeds/preseed_swap.cfg +++ b/preseeds/preseed_swap.cfg @@ -12,6 +12,12 @@ d-i mirror/http/hostname string ftp.fr.debian.org d-i mirror/http/directory string /debian d-i mirror/http/proxy string +# +# REPOS +# +d-i apt-setup/contrib boolean true +d-i apt-setup/non-free boolean true + # # USER ACCOUNT # @@ -48,6 +54,7 @@ d-i partman/confirm_nooverwrite boolean true # PACKAGES # tasksel tasksel/first multiselect none +d-i pkgsel/include string git # # GRUB