From 0e3b7b558d2b382260d17d63cb0fd8db569734ec Mon Sep 17 00:00:00 2001 From: Guillaume Raffy Date: Tue, 23 Oct 2018 16:29:34 +0200 Subject: [PATCH] fixed syntax error that caused the "IPAPPEND 2" option to have no effect see Bug 2482 - debian stretch dhcp network autoconfiguration fails on physix89 --- config/debian/menu.cfg | 27 ++++++++++++------- preseed/debian/jessie/preseed.cfg | 3 ++- preseed/debian/jessie/preseed_cinnamon.cfg | 3 ++- preseed/debian/jessie/preseed_gnome.cfg | 3 ++- preseed/debian/jessie/preseed_mate.cfg | 3 ++- preseed/debian/stretch/preseed.cfg | 3 ++- .../debian/stretch/preseed.cinnamon.uefi.cfg | 3 ++- preseed/debian/stretch/preseed.gnome.uefi.cfg | 3 ++- preseed/debian/stretch/preseed_cinnamon.cfg | 2 +- .../debian/stretch/preseed_computenode.cfg | 3 ++- preseed/debian/stretch/preseed_mate.cfg | 3 ++- preseed/debian/wheezy/preseed.cfg | 3 ++- preseed/debian/wheezy/preseed_cluster.cfg | 3 ++- preseed/debian/wheezy/preseed_gnome.cfg | 3 ++- 14 files changed, 43 insertions(+), 22 deletions(-) diff --git a/config/debian/menu.cfg b/config/debian/menu.cfg index 23cbb50..e7f1137 100644 --- a/config/debian/menu.cfg +++ b/config/debian/menu.cfg @@ -7,7 +7,8 @@ label oldstableFirmware label oldstableAuto menu label Debian jessie amd64 ^PRESEED kernel installer/debian/jessie/amd64/linux - append vga=normal initrd=installer/debian/jessie/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/preseed/debian/jessie/preseed.cfg IPAPPEND 2 + IPAPPEND 2 + append vga=normal initrd=installer/debian/jessie/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/preseed/debian/jessie/preseed.cfg label oldstableI386 menu label Debian jessie ^i386 kernel installer/debian/jessie/i386/linux @@ -21,27 +22,33 @@ label stableFirmware label stableAuto menu label Debian stretch amd64 ^PRESEED kernel installer/debian/stretch/amd64/linux - append vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/preseed/debian/stretch/preseed.cfg IPAPPEND 2 + IPAPPEND 2 + append vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/preseed/debian/stretch/preseed.cfg label stableMate menu label Debian stretch ^Mate amd64 PRESEED kernel installer/debian/stretch/amd64/linux - append vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/preseed/debian/stretch/preseed_mate.cfg IPAPPEND 2 + IPAPPEND 2 + append vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/preseed/debian/stretch/preseed_mate.cfg label stableCinnamon menu label Debian stretch ^Cinnamon amd64 PRESEED kernel installer/debian/stretch/amd64/linux - append vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/preseed/debian/stretch/preseed_cinnamon.cfg IPAPPEND 2 + IPAPPEND 2 + append vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/preseed/debian/stretch/preseed_cinnamon.cfg label stableUefiCinnamon menu label Debian stretch ^Cinnamon amd64 + UEFI PRESEED kernel installer/debian/stretch/amd64/linux - append vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/preseed/debian/stretch/preseed.cinnamon.uefi.cfg IPAPPEND 2 + IPAPPEND 2 + append vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/preseed/debian/stretch/preseed.cinnamon.uefi.cfg label stableUefiGnome menu label Debian stretch ^Gnome amd64 + UEFI PRESEED kernel installer/debian/stretch/amd64/linux - append vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/preseed/debian/stretch/preseed.gnome.uefi.cfg IPAPPEND 2 + IPAPPEND 2 + append vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/preseed/debian/stretch/preseed.gnome.uefi.cfg label stableComputeNode menu label Debian stretch amd64 for compute node PRESEED kernel installer/debian/stretch/amd64/linux - append vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/preseed/debian/stretch/preseed_computenode.cfg IPAPPEND 2 + IPAPPEND 2 + append vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/preseed/debian/stretch/preseed_computenode.cfg label stableI386 menu label Debian stretch ^i386 kernel installer/debian/stretch/i386/linux @@ -55,11 +62,13 @@ label oldoldstableFirmware label oldoldstableAmd64 menu label Debian ^wheezy amd64 PRESEED kernel installer/debian/wheezy/amd64/linux - append vga=normal initrd=installer/debian/wheezy/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/preseed/debian/wheezy/preseed.cfg IPAPPEND 2 + IPAPPEND 2 + append vga=normal initrd=installer/debian/wheezy/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/preseed/debian/wheezy/preseed.cfg label wheezy Cluster node menu label Debian Wheezy amd64 ^Clusternode kernel installer/debian/wheezy/amd64/linux - APPEND vga=normal initrd=installer/debian/wheezy/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/preseed/debian/wheezy/preseed_cluster.cfg IPAPPEND 2 + IPAPPEND 2 + APPEND vga=normal initrd=installer/debian/wheezy/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/preseed/debian/wheezy/preseed_cluster.cfg label oldoldstableI386 menu label Debian wheezy i386 kernel installer/debian/wheezy/i386/linux diff --git a/preseed/debian/jessie/preseed.cfg b/preseed/debian/jessie/preseed.cfg index 07979bb..a08a854 100644 --- a/preseed/debian/jessie/preseed.cfg +++ b/preseed/debian/jessie/preseed.cfg @@ -6,7 +6,8 @@ #label jessie # menu label Debian GNU/Linux ^Jessie 64 bits WITH PRESEED # kernel installer/debian/jessie/amd64/linux -# APPEND vga=normal initrd=installer/debian/jessie/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/jessie/amd64/preseed.cfg IPAPPEND 2 +# IPAPPEND 2 +# APPEND vga=normal initrd=installer/debian/jessie/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/jessie/amd64/preseed.cfg diff --git a/preseed/debian/jessie/preseed_cinnamon.cfg b/preseed/debian/jessie/preseed_cinnamon.cfg index cce3fbc..c2216d5 100644 --- a/preseed/debian/jessie/preseed_cinnamon.cfg +++ b/preseed/debian/jessie/preseed_cinnamon.cfg @@ -6,7 +6,8 @@ #label jessie # menu label Debian GNU/Linux ^Jessie 64 bits WITH PRESEED # kernel installer/debian/jessie/amd64/linux -# APPEND vga=normal initrd=installer/debian/jessie/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/jessie/amd64/preseed.cfg IPAPPEND 2 +# IPAPPEND 2 +# APPEND vga=normal initrd=installer/debian/jessie/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/jessie/amd64/preseed.cfg diff --git a/preseed/debian/jessie/preseed_gnome.cfg b/preseed/debian/jessie/preseed_gnome.cfg index 60a8aed..dcb578d 100644 --- a/preseed/debian/jessie/preseed_gnome.cfg +++ b/preseed/debian/jessie/preseed_gnome.cfg @@ -6,7 +6,8 @@ #label jessie # menu label Debian GNU/Linux ^Jessie 64 bits WITH PRESEED # kernel installer/debian/jessie/amd64/linux -# APPEND vga=normal initrd=installer/debian/jessie/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/jessie/amd64/preseed.cfg IPAPPEND 2 +# IPAPPEND 2 +# APPEND vga=normal initrd=installer/debian/jessie/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/jessie/amd64/preseed.cfg diff --git a/preseed/debian/jessie/preseed_mate.cfg b/preseed/debian/jessie/preseed_mate.cfg index 0822964..ac90bc4 100644 --- a/preseed/debian/jessie/preseed_mate.cfg +++ b/preseed/debian/jessie/preseed_mate.cfg @@ -6,7 +6,8 @@ #label jessie # menu label Debian GNU/Linux ^Jessie 64 bits WITH PRESEED # kernel installer/debian/jessie/amd64/linux -# APPEND vga=normal initrd=installer/debian/jessie/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/jessie/amd64/preseed.cfg IPAPPEND 2 +# IPAPPEND 2 +# APPEND vga=normal initrd=installer/debian/jessie/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/jessie/amd64/preseed.cfg diff --git a/preseed/debian/stretch/preseed.cfg b/preseed/debian/stretch/preseed.cfg index afdfe2e..e8e0652 100644 --- a/preseed/debian/stretch/preseed.cfg +++ b/preseed/debian/stretch/preseed.cfg @@ -6,7 +6,8 @@ #label stretch # menu label Debian GNU/Linux ^Stretch 64 bits WITH PRESEED # kernel installer/debian/stretch/amd64/linux -# APPEND vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/stretch/amd64/preseed.cfg IPAPPEND 2 +# IPAPPEND 2 +# APPEND vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/stretch/amd64/preseed.cfg diff --git a/preseed/debian/stretch/preseed.cinnamon.uefi.cfg b/preseed/debian/stretch/preseed.cinnamon.uefi.cfg index 78eb26e..445f85d 100644 --- a/preseed/debian/stretch/preseed.cinnamon.uefi.cfg +++ b/preseed/debian/stretch/preseed.cinnamon.uefi.cfg @@ -6,7 +6,8 @@ #label stretch # menu label Debian GNU/Linux ^Stretch 64 bits WITH PRESEED # kernel installer/debian/stretch/amd64/linux -# APPEND vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/stretch/amd64/preseed.cfg IPAPPEND 2 +# IPAPPEND 2 +# APPEND vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/stretch/amd64/preseed.cfg diff --git a/preseed/debian/stretch/preseed.gnome.uefi.cfg b/preseed/debian/stretch/preseed.gnome.uefi.cfg index 51a3af4..705c279 100644 --- a/preseed/debian/stretch/preseed.gnome.uefi.cfg +++ b/preseed/debian/stretch/preseed.gnome.uefi.cfg @@ -6,7 +6,8 @@ #label stretch # menu label Debian GNU/Linux ^Stretch 64 bits WITH PRESEED # kernel installer/debian/stretch/amd64/linux -# APPEND vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/stretch/amd64/preseed.cfg IPAPPEND 2 +# IPAPPEND 2 +# APPEND vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/stretch/amd64/preseed.cfg diff --git a/preseed/debian/stretch/preseed_cinnamon.cfg b/preseed/debian/stretch/preseed_cinnamon.cfg index 55c30c5..1df94e3 100644 --- a/preseed/debian/stretch/preseed_cinnamon.cfg +++ b/preseed/debian/stretch/preseed_cinnamon.cfg @@ -6,7 +6,7 @@ #label stretch # menu label Debian GNU/Linux ^Stretch 64 bits WITH PRESEED # kernel installer/debian/stretch/amd64/linux -# APPEND vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/stretch/amd64/preseed.cfg IPAPPEND 2 +# APPEND vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/stretch/amd64/preseed.cfg diff --git a/preseed/debian/stretch/preseed_computenode.cfg b/preseed/debian/stretch/preseed_computenode.cfg index 888fd26..0f950ef 100644 --- a/preseed/debian/stretch/preseed_computenode.cfg +++ b/preseed/debian/stretch/preseed_computenode.cfg @@ -6,7 +6,8 @@ #label stretch # menu label Debian GNU/Linux ^Stretch 64 bits WITH PRESEED # kernel installer/debian/stretch/amd64/linux -# APPEND vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/stretch/amd64/preseed.cfg IPAPPEND 2 +# IPAPPEND 2 +# APPEND vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/stretch/amd64/preseed.cfg diff --git a/preseed/debian/stretch/preseed_mate.cfg b/preseed/debian/stretch/preseed_mate.cfg index 6f608d3..6c6170c 100644 --- a/preseed/debian/stretch/preseed_mate.cfg +++ b/preseed/debian/stretch/preseed_mate.cfg @@ -6,7 +6,8 @@ #label stretch # menu label Debian GNU/Linux ^Stretch 64 bits WITH PRESEED # kernel installer/debian/stretch/amd64/linux -# APPEND vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/stretch/amd64/preseed.cfg IPAPPEND 2 +# IPAPPEND 2 +# APPEND vga=normal initrd=installer/debian/stretch/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/stretch/amd64/preseed.cfg diff --git a/preseed/debian/wheezy/preseed.cfg b/preseed/debian/wheezy/preseed.cfg index c82a9ee..445c290 100644 --- a/preseed/debian/wheezy/preseed.cfg +++ b/preseed/debian/wheezy/preseed.cfg @@ -6,7 +6,8 @@ #label wheezy # menu label Debian GNU/Linux Wheezy 64 bits WITH ^PRESEED # kernel installer/debian/wheezy/amd64/linux -# APPEND vga=normal initrd=installer/debian/wheezy/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/wheezy/amd64/preseed.cfg IPAPPEND 2 +# IPAPPEND 2 +# APPEND vga=normal initrd=installer/debian/wheezy/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/wheezy/amd64/preseed.cfg diff --git a/preseed/debian/wheezy/preseed_cluster.cfg b/preseed/debian/wheezy/preseed_cluster.cfg index 5683ee5..14f4b6b 100644 --- a/preseed/debian/wheezy/preseed_cluster.cfg +++ b/preseed/debian/wheezy/preseed_cluster.cfg @@ -6,7 +6,8 @@ #label wheezy Cluster node # menu label Debian Wheezy amd64 ^Clusternode # kernel installer/debian/wheezy/amd64/linux -# APPEND vga=normal initrd=installer/debian/wheezy/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/wheezy/amd64/preseed_cluster.cfg IPAPPEND 2 +# IPAPPEND 2 +# APPEND vga=normal initrd=installer/debian/wheezy/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/wheezy/amd64/preseed_cluster.cfg diff --git a/preseed/debian/wheezy/preseed_gnome.cfg b/preseed/debian/wheezy/preseed_gnome.cfg index 3749a1e..d5a73b4 100644 --- a/preseed/debian/wheezy/preseed_gnome.cfg +++ b/preseed/debian/wheezy/preseed_gnome.cfg @@ -6,7 +6,8 @@ #label wheezy # menu label Debian GNU/Linux Wheezy 64 bits WITH ^PRESEED # kernel installer/debian/wheezy/amd64/linux -# APPEND vga=normal initrd=installer/debian/wheezy/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/wheezy/amd64/preseed.cfg IPAPPEND 2 +# IPAPPEND 2 +# APPEND vga=normal initrd=installer/debian/wheezy/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.203.27/installer/debian/wheezy/amd64/preseed.cfg