Remove *.busybox links

4 files changed, 5 insertions, 3 deletions

diff --git a/build b/build
index 6b2bef8..1c35496 100755
--- a/build
+++ b/build
@@ -42,7 +42,7 @@ install: build
 		case "$${f}" in \
 			dest/bin/busybox | dest/bin/sh) ;; \
 			*) \
-				mv "$${f}" "$${f}.busybox"; \
+				rm "$${f}"; \
 				printf '%s\n' "$${f#dest}" >&3; \
 				;; \
 		esac; \
diff --git a/busybox.pkg/postinst b/busybox.pkg/postinst
index ae66306..1a5d744 100755
--- a/busybox.pkg/postinst
+++ b/busybox.pkg/postinst
@@ -7,7 +7,7 @@ if [ "x${1}" = 'xconfigure' ]; then
 		# increased to 30), and expect-doc provides a /usr/bin/mkpasswd
 		# alternative with priority 10.
 		update-alternatives --install "${link}" "${link##*/}" \
-			"${link}.busybox" 15
+			/bin/busybox 15
 	done </usr/share/busybox/alternatives
 	if ! [ -f /etc/rc.policy ]; then
 		if [ "x$(cat /etc/proteanos_plat)" = 'xdev' ]; then
diff --git a/busybox.pkg/prerm b/busybox.pkg/prerm
index 39f963d..25e55f6 100755
--- a/busybox.pkg/prerm
+++ b/busybox.pkg/prerm
@@ -7,7 +7,7 @@ if [ "x${1}" = 'xupgrade' ]; then
 		done </usr/share/busybox/init-scripts
 	fi
 	while read link; do
-		update-alternatives --remove "${link##*/}" "${link}.busybox"
+		update-alternatives --remove "${link##*/}" /bin/busybox
 	done </usr/share/busybox/alternatives
 	if [ -f /usr/share/busybox/www/SHA256SUMS ]; then
 		if [ -f /var/www/index.html ] && \
diff --git a/changelog b/changelog
index c9383a8..70fdbc3 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,8 @@ busybox (1.32.0-2) trunk
   * busybox: The networking service init script is again included if
     ifup or ifdown are enabled.  It was missing from version 1.32.0-1
     after upstream split the ifup/ifdown configuration option into two.
+  * Utility links managed with update-alternatives now point directly to
+    </bin/busybox>, and <*.busybox> links have been removed.
 
  -- Patrick McDermott <patrick.mcdermott@libiquity.com>  Thu, 10 Dec 2020 06:23:11 -0500