On 2023-05-01 20:05:58 +0200, Jonathan Carter wrote: > Package: release.debian.org > Severity: normal > User: [email protected] > Usertags: unblock > X-Debbugs-Cc: [email protected] > Control: affects -1 + src:calamares-settings-debian > > Please unblock package calamares-settings-debian > > This change re-enables os-prober during installation on Debian live images > when using Calamares, so that dual-booted systems will detect other operating > systems. > > Sorry for the noise in the debdiff, it took a few times to get just right, > the pertinent > change is on the last lines. > > thanks, > > [ Checklist ] > [x] all changes are documented in the d/changelog > [x] I reviewed all changes and I approve them > [x] attach debdiff against the package in testing > > [ debdiff ] > """ > diff -Nru calamares-settings-debian-12.0.5/CHANGELOG > calamares-settings-debian-12.0.8/CHANGELOG > --- calamares-settings-debian-12.0.5/CHANGELOG 2023-03-06 > 19:22:24.000000000 +0200 > +++ calamares-settings-debian-12.0.8/CHANGELOG 2023-04-26 > 14:23:37.000000000 +0200 > @@ -1,3 +1,15 @@ > +[ 10.0.8 ] > + > + * Do grub work within the chroot > + > +[ 10.0.7 ] > + > + * Enable os-prober /after/ grub has been installed.
There are typos in the version numbers. But that can be fixed later. Cheers > + > +[ 12.0.6 ] > + > + * Enable os-prober > + > [ 12.0.5 ] > > * Update sources.list to include non-free-firmware and backports > diff -Nru calamares-settings-debian-12.0.5/debian/changelog > calamares-settings-debian-12.0.8/debian/changelog > --- calamares-settings-debian-12.0.5/debian/changelog 2023-04-04 > 09:51:03.000000000 +0200 > +++ calamares-settings-debian-12.0.8/debian/changelog 2023-04-26 > 14:25:34.000000000 +0200 > @@ -1,3 +1,17 @@ > +calamares-settings-debian (12.0.8-1) unstable; urgency=medium > + > + * New upstream release > + - Make grub changes in the correct place (within the chroot) > + > + -- Jonathan Carter <[email protected]> Wed, 26 Apr 2023 14:25:34 +0200 > + > +calamares-settings-debian (12.0.7-1) unstable; urgency=medium > + > + * New upstream release > + - Re-enable os-prober > + > + -- Jonathan Carter <[email protected]> Wed, 26 Apr 2023 13:43:01 +0200 > + > calamares-settings-debian (12.0.5-2) unstable; urgency=medium > > * Depend on pkexec (Closes: #1033930) > diff -Nru calamares-settings-debian-12.0.5/scripts/bootloader-config > calamares-settings-debian-12.0.8/scripts/bootloader-config > --- calamares-settings-debian-12.0.5/scripts/bootloader-config > 2023-03-06 19:22:24.000000000 +0200 > +++ calamares-settings-debian-12.0.8/scripts/bootloader-config > 2023-04-26 14:23:37.000000000 +0200 > @@ -19,3 +19,7 @@ > echo " * install grub... (bios)" > DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc > cryptsetup keyutils > fi > + > +# Re-enable os-prober: > +sed -i "s/#GRUB_DISABLE_OS_PROBER=false/# OS_PROBER re-enabled by Debian > Calamares installation:\nGRUB_DISABLE_OS_PROBER=false/g" > $CHROOT/etc/default/grub > +chroot $CHROOT /usr/sbin/update-grub > """ > > -Jonathan > > unblock calamares-settings-debian/12.0.8-1 > -- Sebastian Ramacher
