Bug#935540: debian-installer: Errors on sources.list security repositories
On Sun, 25 Aug 2019 16:29:51 +0200 Cyril Brulebois wrote: > [ Please don't drop submitters; quoting in full accordingly. ] > > Philip Hands (2019-08-24): > > Cyril Brulebois writes: > > > > > Control: tag -1 - d-i > > > > > > Hi Gustavo, > > > > > > Gustavo Romero Vazquez (2019-08-23): > > >> See the Wiki Debian (https://wiki.debian.org/Status/Testing), the > > >> security repositories for bullseye are the next (and they working): > > >> > > >> deb http://security.debian.org testing-security main contrib non-free > > >> deb-src http://security.debian.org testing-security main contrib non-free > > >> > > >> Regards and good luck!! > > > > > > You're absolutely right. I had stashed a branch a while ago, but it was > > > suggested to handle things slightly differently: > > > > > >“do it other way around and hardcode the old releases rather than > > > hardcode the new one?” > > > > > > I've just rebased it on top of master, and it'd be great if someone > > > could rework it to take the above comment in consideration: > > > > > > https://salsa.debian.org/installer-team/apt-setup/tree/pu/security-naming-scheme > > > > Hopefully something like this what you were wanting done: > > > > https://salsa.debian.org/installer-team/apt-setup/commit/78078caff231de7bb5a161fa19210b4ac6eb2cb5 > > Yes, that looks sane enough. > > I meant to check how this could affect Ubuntu. But from what I can see > in apt-setup/0.141ubuntu2, there are a bunch of changes already anyway, > so except for a possible merge conflict, that shouldn't be much of an > issue. > > Feel free to release that to master/the archive if you like. Any updates on this? I am hit by this bug as well and the proposed fix looks good to me. -- Benjamin Drung Debian & Ubuntu Developer Platform Engineering Compute (Enterprise Cloud) 1&1 IONOS SE | Greifswalder Str. 207 | 10405 Berlin | Germany E-mail: benjamin.dr...@cloud.ionos.com | Web: www.ionos.de Hauptsitz Montabaur, Amtsgericht Montabaur, HRB 24498 Vorstand: Dr. Christian Böing, Hüseyin Dogan, Hans-Henning Kettler, Matthias Steinberg, Achim Weiß Aufsichtsratsvorsitzender: Markus Kadelke Member of United Internet
Bug#917090: flash-kernel: Please avoid leading or trailing spaces in bootargs
Package: flash-kernel
Version: 3.96
Severity: normal
Tags: patch
Dear Maintainer,
Leading or trailing spaces in bootargs and therefore /proc/cmdline are
inconvenient. Avoid them by only adding spaces between parameters that are not
empty. A patch for that is attached.
I have successfully tested it on Hardkernel's Odroid HC1.
--
Benjamin Drung
Debian & Ubuntu Developer
>From 38bb9da092897928666175042ac0cc34f0777075 Mon Sep 17 00:00:00 2001
From: Benjamin Drung
Date: Sat, 22 Dec 2018 13:47:58 +0100
Subject: [PATCH] Avoid leading or trailing spaces in bootargs
Leading or trailing spaces in bootargs and therefore /proc/cmdline are
inconvenient. Avoid them by only adding spaces between parameters that are not
empty.
Tested on Hardkernel's Odroid HC1.
---
bootscript/all/bootscr.uboot-generic | 8 ++--
bootscript/arm64/bootscr.uboot-generic | 8 ++--
bootscript/armhf/bootscr.sunxi | 8 ++--
functions | 15 +--
4 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/bootscript/all/bootscr.uboot-generic
b/bootscript/all/bootscr.uboot-generic
index 989f14c..631955f 100644
--- a/bootscript/all/bootscr.uboot-generic
+++ b/bootscript/all/bootscr.uboot-generic
@@ -22,10 +22,14 @@ if test "${console}" = "ttymxc0" && test -n "${baudrate}";
then
fi
if test -n "${console}"; then
- setenv bootargs "${bootargs} console=${console}"
+ if test -n "${bootargs}"; then
+setenv bootargs "${bootargs} console=${console}"
+ else
+setenv bootargs "console=${console}"
+ fi
fi
-setenv bootargs "@@LINUX_KERNEL_CMDLINE_DEFAULTS@@ ${bootargs}
@@LINUX_KERNEL_CMDLINE@@"
+setenv bootargs
"@@LINUX_KERNEL_CMDLINE_DEFAULTSLINUX_KERNEL_CMDLINE_DEFAULTS_DELIM@@${bootargs}@@LINUX_KERNEL_CMDLINE_DELIMLINUX_KERNEL_CMDLINE@@"
@@UBOOT_ENV_EXTRA@@
if test -z "${fk_kvers}"; then
diff --git a/bootscript/arm64/bootscr.uboot-generic
b/bootscript/arm64/bootscr.uboot-generic
index 33f90d2..d644ee5 100644
--- a/bootscript/arm64/bootscr.uboot-generic
+++ b/bootscript/arm64/bootscr.uboot-generic
@@ -15,10 +15,14 @@
# The uboot must support the booti and generic filesystem load commands.
if test -n "${console}"; then
- setenv bootargs "${bootargs} console=${console}"
+ if test -n "${bootargs}"; then
+setenv bootargs "${bootargs} console=${console}"
+ else
+setenv bootargs "console=${console}"
+ fi
fi
-setenv bootargs @@LINUX_KERNEL_CMDLINE_DEFAULTS@@ ${bootargs}
@@LINUX_KERNEL_CMDLINE@@
+setenv bootargs
"@@LINUX_KERNEL_CMDLINE_DEFAULTSLINUX_KERNEL_CMDLINE_DEFAULTS_DELIM@@${bootargs}@@LINUX_KERNEL_CMDLINE_DELIMLINUX_KERNEL_CMDLINE@@"
@@UBOOT_ENV_EXTRA@@
if test -z "${fk_kvers}"; then
diff --git a/bootscript/armhf/bootscr.sunxi b/bootscript/armhf/bootscr.sunxi
index 9576b24..8750583 100644
--- a/bootscript/armhf/bootscr.sunxi
+++ b/bootscript/armhf/bootscr.sunxi
@@ -33,10 +33,14 @@ else
fi
if test -n "${console}"; then
- setenv bootargs "${bootargs} console=${console}"
+ if test -n "${bootargs}"; then
+setenv bootargs "${bootargs} console=${console}"
+ else
+setenv bootargs "console=${console}"
+ fi
fi
-setenv bootargs @@LINUX_KERNEL_CMDLINE_DEFAULTS@@ ${bootargs}
@@LINUX_KERNEL_CMDLINE@@
+setenv bootargs
"@@LINUX_KERNEL_CMDLINE_DEFAULTSLINUX_KERNEL_CMDLINE_DEFAULTS_DELIM@@${bootargs}@@LINUX_KERNEL_CMDLINE_DELIMLINUX_KERNEL_CMDLINE@@"
@@UBOOT_ENV_EXTRA@@
if test -z "${image_locations}"; then
diff --git a/functions b/functions
index 1533192..de925f8 100644
--- a/functions
+++ b/functions
@@ -432,6 +432,12 @@ get_kernel_cmdline_defaults() {
echo "$LINUX_KERNEL_CMDLINE_DEFAULTS"
}
+get_delimiter() {
+ if test -n "$1"; then
+ echo " "
+ fi
+}
+
mkimage_kernel() {
local kaddr="$1"
local epoint="$2"
@@ -475,10 +481,15 @@ mkimage_script() {
echo "WARNING: ubootenv.d snippet used, but $sdata has
no @@UBOOT_ENV_EXTRA@@ marker. Snippet will be ignored." >&2
fi
+ kernel_cmdline=$(get_kernel_cmdline)
+ kernel_cmdline_defaults=$(get_kernel_cmdline_defaults)
+
printf "Generating boot script u-boot image... " >&2
sed -e "s/@@KERNEL_VERSION@@/$kvers/g" \
--e "s!@@LINUX_KERNEL_CMDLINE@@!$(get_kernel_cmdline)!g" \
--e
"s!@@LINUX_KERNEL_CMDLINE_DEFAULTS@@!$(get_kernel_cmdline_defaults)!g" \
+-e "s!@@LINUX_KERNEL_CMDLINE@@!$kernel_cmdline!g" \
+-e
"s!@@LINUX_KERNEL_CMDLINE_DEFAULTS@@!$kernel_cmdline_defaults!g" \
+-e "s!@@LINUX_KERNEL_CMDLINE_DELIM@@!$(get_delimiter
"$kernel_cmdline")!g" \
+-e "s!@@LINUX_KERNEL_CMDLINE_DEFAULTS_DELIM@@!$(get_delimiter
"$kernel_cmdline_defaults")!g" \
-e "/@@UBOOT_ENV_EXTRA@@/{
s/@@UBOOT_ENV_EXTRA@@//g
r $ubootenv
--
2.19.1
Bug#916980: flash-kernel: Please support Hardkernel's Odroid HC1/HC2 boards
Package: flash-kernel Version: 3.96 Severity: normal Tags: patch Dear Maintainer, please support Hardkernel's Odroid HC1/HC2 boards. Odroid HC1 board is based on Odroid XU4 board, but it has no HDMI, no eMMC, no built-in USB3.0 hub, no extension port pins, and no GPIO button. USB3.0 ports are used for built-in JMicron USB to SATA bridge and Gigabit R8152 ethernet chips. HC1 uses only passive cooling. The kernel ships a different device tree blob for it. I have successfully tested following flash-kernel configuration: Machine: Hardkernel Odroid HC1 Kernel-Flavors: armmp armmp-lpae DTB-Id: exynos5422-odroidhc1.dtb Boot-Script-Path: /boot/boot.scr U-Boot-Script-Name: bootscr.uboot-generic Required-Packages: u-boot-tools The Odroid HC2 uses the same hardware, but a bigger case to allow mounting a 3.5" drive instead of a 2.5" drive. The Linux kernel does not provide a HC2 DTB so the HC1 DTB is also used for the Odroid HC2. So this flash-kernel configuration should also support the Odroid HC2. -- Benjamin Drung Debian & Ubuntu Developer
Bug#891857: busybox: Special case for /32 subnets not working as expected
On Thu, 01 Mar 2018 17:55:52 +0100 Yuval Freund <yuval.fre...@profitbricks.com> wrote: > A fix for /32 has already been implemented in an earlier version of > busybox, but it doesn't seem to work as expected, because the interface > isn't defined while adding the relevant route. To be more precise: The ip command will fail if the device is not specified: ~# ip -4 route add default via 157.97.106.1 onlink ip: RTNETLINK answers: No such device ~# ip -4 route add default via 157.97.106.1 dev eth0 onlink ~# -- Benjamin Drung System Developer Debian & Ubuntu Developer ProfitBricks GmbH Greifswalder Str. 207 D - 10405 Berlin Email: benjamin.dr...@profitbricks.com URL: https://www.profitbricks.de Sitz der Gesellschaft: Berlin Registergericht: Amtsgericht Charlottenburg, HRB 125506 B Geschäftsführer: Achim Weiss, Matthias Steinberg
Bug#747515: grub-installer: Please add a grub-installer/timeout installer option
Package: grub-installer Version: 1.94 Severity: minor Tags: patch Please add a grub-installer/timeout Debian installer option to change the grub timeout. I want to reduce the grub timeout to 2 seconds without writing a preseed/late_command rules for it. This option is already implemented in Ubuntu's grub-installer package. You might want to adopt their modification. The part of the Ubuntu modification is attached as patch against git head. -- Benjamin Drung System Developer ProfitBricks GmbH - The IaaS-Company Greifswalder Str. 207 D - 10405 Berlin Mail: benjamin.dr...@profitbricks.com Fax: +49 30 577 008 598 URL: http://www.profitbricks.com Sitz der Gesellschaft: Berlin. Registergericht: Amtsgericht Charlottenburg, HRB 125506 B. Geschäftsführer: Andreas Gauger, Achim Weiss. diff --git a/grub-installer b/grub-installer index be63e9e..f6011f3 100755 --- a/grub-installer +++ b/grub-installer @@ -1059,6 +1059,42 @@ if [ $grub_version = grub ]; then fi fi +if db_get grub-installer/timeout +then + # Check whether it's a number + if [ $RET -eq $RET ] 2 /dev/null + then + timeout=$RET + fi +fi + +if [ -s /tmp/os-probed ]; then + # Other operating systems are installed, so show the menu by default + # and raise the timeout. + if [ $grub_version = grub ]; then + sed -i 's/^hiddenmenu[[:space:]]*$/#hiddenmenu/; + s/^\(timeout[[:space:]][[:space:]]*\).*/\110/' \ + $ROOT/boot/grub/menu.lst + else + sed -i 's/^GRUB_HIDDEN_TIMEOUT=.*/#/; + s/^GRUB_TIMEOUT=.*/GRUB_TIMEOUT=10/' \ + $ROOT/etc/default/grub + update_grub # propagate to grub.cfg + fi +elif [ -n $timeout ]; then + # Leave a slight delay + if [ $grub_version = grub ]; then + sed -i 's/^hiddenmenu[[:space:]]*$/#hiddenmenu/; + s/^\(timeout[[:space:]][[:space:]]*\).*/\1'$timeout'/' \ + $ROOT/boot/grub/menu.lst + else + sed -i 's/^GRUB_HIDDEN_TIMEOUT=.*/#/; + s/^GRUB_TIMEOUT=.*/GRUB_TIMEOUT='$timeout'/' \ + $ROOT/etc/default/grub + update_grub # propagate to grub.cfg + fi +fi + if [ $serial ] ; then # Modify menu.lst so _grub_ uses serial console. case $grub_package in
Bug#684128: SI units (was: failure to communicate)
Am Freitag, den 05.04.2013, 12:59 +0100 schrieb Dmitrijs Ledkovs: The default to base-10 units, is good as majority of the installer deals with HDD drives (not SSD) and not RAM. SSD manufactures use base-10 units, too. Even 128 GB SSDs have 128 * 10^9 bytes for the users, but 128 * 2^30 bytes internally. The difference between 128 GiB and 128 GB (9.44 GB) is used for over-provisioning. ps. there are disk manufactures that mix base-2 and base-10 units. E.g. using one to calculate 1MB and then using the other multiply and gain GB/TB factors /o\ I know one example: The 1.44 MB labeled floppy, which contains twice as much space as a 720 KB floppy. The 720 KB floppy has 720 KiB and the 1.44 MB has 2 * 720 KiB = 1.44 * 1000 * 1024 bytes = 1.41 MiB = 1.47 MB! -- Benjamin Drung Debian Ubuntu Developer -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1365165546.3086.10.camel@deep-thought
