Clean up the DEP17 dpkg diversions
Bug #2070061 reported by
Simon Chopin
This bug affects 1 person
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
base-files (Ubuntu) |
Fix Released
|
Undecided
|
Simon Chopin | ||
glibc (Ubuntu) |
In Progress
|
Undecided
|
Simon Chopin |
Bug Description
For the DEP17 effort, we've introduced a number of dpkg diversions of the form $foo -> $foo.usr-is-merged, ahead of Debian. They've done since their own transition, and the diversions they added are much less numerous and much more discreet (only for "multiarch" dirs such as /lib64 and /lib32, and using /.$foo.
When merging glibc and base-files, where those diversions are added in the preinsts, we should take care of cleaning up our old diversions as well as whatever still clutter the filesystem.
Related branches
~schopin/ubuntu/+source/base-files:merge-oracular
- Julian Andres Klode (community): Approve
- Canonical Server Reporter: Pending requested
- git-ubuntu import: Pending requested
-
Diff: 3132 lines (+2514/-62)33 files modifieddebian/base-files.dirs (+1/-0)
debian/base-files.maintscript (+1/-0)
debian/changelog (+1910/-1)
debian/clean (+1/-0)
debian/control (+16/-2)
debian/motd-news (+19/-0)
debian/motd-news-config.install (+1/-0)
debian/motd-news-config.lintian-overrides (+5/-0)
debian/motd-news-config.postinst (+55/-0)
debian/motd-news.service (+8/-0)
debian/motd-news.timer (+11/-0)
debian/postinst (+26/-5)
debian/preinst (+14/-0)
debian/rules (+16/-2)
dev/null (+0/-2)
etc/host.conf (+2/-0)
etc/issue (+1/-1)
etc/issue.net (+1/-1)
etc/legal (+8/-0)
etc/lsb-release (+4/-0)
etc/os-release (+13/-7)
locale-check.c (+80/-0)
logos/ubuntu-logo.svg (+1/-0)
motd/00-header (+29/-0)
motd/10-help-text (+26/-0)
motd/50-motd-news (+146/-0)
origins/ubuntu (+4/-0)
profile.d/01-locale-fix.sh (+2/-0)
share/dot.bashrc (+97/-17)
share/info.dir (+1/-1)
share/networks (+2/-0)
share/profile (+0/-7)
share/profile.md5sums (+13/-16)
Changed in glibc (Ubuntu): | |
status: | New → In Progress |
assignee: | nobody → Simon Chopin (schopin) |
To post a comment you must log in.
Speaking of which, is the following expected (a system that has recently been upgraded to 24.04):
```
# ls -la /
insgesamt 84
drwxr-xr-x 21 root root 4096 Jun 24 23:49 .
drwxr-xr-x 21 root root 4096 Jun 24 23:49 ..
lrwxrwxrwx 1 root root 7 Jan 7 00:36 bin -> usr/bin
drwxr-xr-x 2 root root 4096 Apr 8 16:46 bin.usr-is-merged
drwxr-xr-x 4 root root 4096 Jun 14 12:19 boot
drwxr-xr-x 19 root root 5040 Jun 24 23:46 dev
drwxr-xr-x 148 root root 12288 Jun 24 23:48 etc
drwxr-xr-x 3 root root 4096 Jan 19 17:12 home
lrwxrwxrwx 1 root root 7 Jan 7 00:36 lib -> usr/lib
lrwxrwxrwx 1 root root 9 Jan 7 00:36 lib32 -> usr/lib32
lrwxrwxrwx 1 root root 9 Jan 7 00:36 lib64 -> usr/lib64
drwxr-xr-x 2 root root 4096 Apr 8 16:46 lib.usr-is-merged
lrwxrwxrwx 1 root root 10 Jan 7 00:36 libx32 -> usr/libx32
drwx------ 2 root root 16384 Jan 6 23:19 lost+found
drwxr-xr-x 3 root root 4096 Jan 11 21:44 media
drwxr-xr-x 6 root root 4096 Jun 2 09:54 mnt
drwxr-xr-x 3 root root 4096 Jan 7 21:14 opt
dr-xr-xr-x 433 root root 0 Jun 24 23:45 proc
drwx------ 9 root root 4096 Jun 14 12:02 root
drwxr-xr-x 35 root root 860 Jun 24 23:48 run
lrwxrwxrwx 1 root root 8 Jan 7 00:36 sbin -> usr/sbin
drwxr-xr-x 2 root root 4096 Apr 8 16:46 sbin.usr-is-merged
drwxr-xr-x 2 root root 4096 Feb 28 01:24 srv
dr-xr-xr-x 13 root root 0 Jun 24 23:48 sys
drwxrwxrwt 20 root root 520 Jun 24 23:51 tmp
drwxr-xr-x 14 root root 4096 Aug 8 2023 usr
drwxr-xr-x 14 root root 4096 Jun 14 12:23 var
```
Specifically those $foo.usr-is-merged directories?