debian-installer-utils:helmutg/fix-usrmerge

Last commit made on 2024-02-21
Get this branch:
git clone -b helmutg/fix-usrmerge https://git.launchpad.net/debian-installer-utils

Branch merges

Branch information

Name:
helmutg/fix-usrmerge
Repository:
lp:debian-installer-utils

Recent commits

6411e87... by Helmut Grohne

chroot_setup.sh: refactor diversion duplication

With an eye towards the eventual removal of this code, we call the
divert and undivert functions with the canonicalized paths and derive
the aliased path from the canonicalized one instead of doing the
reverse. This isolates the code to be removed to two functions and can
be performed by the janitor.

Remove upstart-specific diversions, because upstart has been removed
since at least bullseye.

Document why we are doing this and add a reference to DEP17.

Reported-by: Raphaƫl Hertzog <email address hidden>

02b2f4c... by Helmut Grohne

chroot_setup.sh: duplicate aliased diversions

start-stop-daemon and initctl have recently moved to /usr. As
chroot-setup.sh diverts the original locations, the diversion does not
match and thus the rename is skipped. Then the affected files are
overwritten and when they are undiverted, nothing can be moved back.
Therefore, these files may go missing. This has been observed in Kali
recently, but it also affects Debian.

Link: https://bugs.kali.org/view.php?id=8628

aff84b5... by Steve McIntyre

Merge branch 'user-params-exclude-initrd' into 'master'

user-params: Exclude initrd

See merge request installer-team/debian-installer-utils!10

116ed18... by Colin Watson

user-params: Exclude initrd

It's sometimes hard to avoid syslinux appending it after "---".

275613d... by Steve McIntyre

Release version 1.148

c1a8855... by Steve McIntyre

Merge branch 'file-mediamount' into 'master'

be more circumspect about (un)mounting /media

See merge request installer-team/debian-installer-utils!8

07473eb... by Philip Hands

changelog

08ba328... by Philip Hands

be more circumspect about (un)mounting /media

This now unmounts /media if it was mounted, before returning, and it
only tries to mount something when the file path starts with '/media/' which
will ensure that it doesn't bother for '/preseed.cfg'.

Perhaps that test should instead look for '/preseed.cfg' and attempt
mountmedia for anything else.

6ec044f... by Philip Hands

changelog: trim boring details

1b7935a... by Philip Hands

Merge branch 'fetch-url-empty-dest' into 'master'

fetch-url: do a test fetch when dest == ""

See merge request installer-team/debian-installer-utils!7