[Piuparts-devel] [Git][debian/piuparts][develop] 2 commits: also fix /bin/sync diversion for bullseye

[Nicolas Dandrimont (@olasd)]

Nicolas Dandrimont pushed to branch develop at Debian / piuparts


Commits:
3cfa9b97 by Helmut Grohne at 2024-05-04T13:11:36+00:00
also fix /bin/sync diversion for bullseye

When doing this in bookworm, we're in the unmerged case. Unfortunately,
I added --no-rename, so now ln -sv sees that /bin/sync exists and fails.

The --no-rename was added, because renaming is ambiguous on merged-/usr,
but we're in the unmerged case here, so use --rename.

Closes: #1068312
Fixes: 1b9a3843964b ("also fix /bin/sync diversion for bookworm")

- - - - -
66637652 by Nicolas Dandrimont at 2024-05-04T13:48:00+00:00
Merge branch 'helmutg/fix-sync-diversion-for-bullseye' into 'develop'

also fix /bin/sync diversion for bullseye

See merge request debian/piuparts!56
- - - - -


1 changed file:

- custom-scripts/scripts/post_setup_force-unsafe-io


Changes:

=====================================
custom-scripts/scripts/post_setup_force-unsafe-io
=====================================
@@ -26,9 +26,10 @@ then
 			mv /bin/sync /bin/sync.distrib.usr-is-merged
 		fi
 		dpkg-divert --add --no-rename --divert /usr/bin/sync.distrib /usr/bin/sync
-	# else
-	# 	We're probably unmerged-/usr and a single diversion will do.
+		dpkg-divert --add --no-rename --divert /bin/sync.distrib.usr-is-merged /bin/sync
+	else
+		# We're probably unmerged-/usr and a single diversion will do.
+		dpkg-divert --add --rename --divert /bin/sync.distrib /bin/sync
 	fi
-	dpkg-divert --add --no-rename --divert /bin/sync.distrib.usr-is-merged /bin/sync
 	ln -sv true /bin/sync
 fi



View it on GitLab: https://salsa.debian.org/debian/piuparts/-/compare/51e5b1a16c2540dbf17b9128e4f70b777b183e4b...6663765284b6460fef6c51fee46332beacd4de05

-- 
View it on GitLab: https://salsa.debian.org/debian/piuparts/-/compare/51e5b1a16c2540dbf17b9128e4f70b777b183e4b...6663765284b6460fef6c51fee46332beacd4de05
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/piuparts-devel/attachments/20240504/d8837753/attachment.htm>