From 99c888b5eabbb7008bf4451bc62c277f28bb925f Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 16 Sep 2023 12:34:48 +0200 Subject: Only accept installs of usrmerge on unmerged-usr systems As of bookworm, merged-usr is mandatory, and people got caught in the crosshairs of the dpkg fsys-unmessusr debacle and inadvertently reverted back to an unmerged configuration and continue to remain on an unsupported system unknowingly. Help them by erroring out when they are installing packages on /, they are not in a chroot, and a usrmerge package is available. --- apt-pkg/aptconfiguration.cc | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'apt-pkg/aptconfiguration.cc') diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 00a97a0e7..cfe38ec83 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -28,8 +28,8 @@ #include #include #include +#include #include - /*}}}*/ namespace APT { // setDefaultConfigurationForCompressors /*{{{*/ @@ -538,4 +538,31 @@ bool Configuration::isChroot() return once.res; } /*}}}*/ +// isUsrMerged - whether usr is merged t /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool Configuration::checkUsrMerged() +{ + std::string rootDir = _config->FindDir("Dir"); + for (auto dir : {"bin", "sbin", "lib"}) + { + struct stat root; + struct stat usr; + std::string dirInRoot = rootDir + dir; + std::string dirInUsr = rootDir + "usr/" + dir; + + // Missing directories are a boot strap scenario that needs to work + if (stat(dirInRoot.c_str(), &root)) + continue; + if (stat(dirInUsr.c_str(), &usr)) + continue; + if (root.st_dev != usr.st_dev) + return _error->Error("%s is on different device than %s", dirInRoot.c_str(), dirInUsr.c_str()); + if (root.st_ino != usr.st_ino) + return _error->Error("%s resolved to a different inode than %s", dirInRoot.c_str(), dirInUsr.c_str()); + } + + return true; +} + /*}}}*/ } -- cgit v1.2.3-70-g09d2