Package: open-iscsi Version: 2.0.873+git0.3b4b4500-12 Severity: normal Tags: patch Usertags: usrmerge Tags: patch
The package installs a symbolic link to a file with the same name in both /sbin/ and /usr/sbin/, so it makes impossible to convert a system to the everything-in-usr directories scheme. The attached patch solves this problem by creating the link in postinst and only if it is needed. If you do not believe that these symlinks are actually in use by modern software then please consider just removing them. For more information about merged /usr please read https://wiki.debian.org/UsrMerge . -- ciao, Marco
diff -urpN a/debian/changelog b/debian/changelog
--- a/debian/changelog 2015-10-21 11:49:30.000000000 +0200
+++ b/debian/changelog 2016-01-07 22:31:26.000000000 +0100
@@ -1,3 +1,11 @@
+open-iscsi (2.0.873+git0.3b4b4500-12.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Create in postinst the /sbin/iscsi* compatibility symlinks.
+ This is needed to support merged /usr systems. (Closes: #)
+
+ -- Marco d'Itri <m...@linux.it> Thu, 07 Jan 2016 22:29:19 +0100
+
open-iscsi (2.0.873+git0.3b4b4500-12) unstable; urgency=low
[ Christian Perrier ]
diff -urpN a/debian/open-iscsi.links b/debian/open-iscsi.links
--- a/debian/open-iscsi.links 2015-10-21 11:49:30.000000000 +0200
+++ b/debian/open-iscsi.links 2016-01-07 22:29:14.000000000 +0100
@@ -1,5 +1 @@
sbin/iscsiadm usr/bin/iscsiadm
-sbin/iscsid usr/sbin/iscsid
-sbin/iscsistart usr/sbin/iscsistart
-sbin/iscsi_discovery usr/sbin/iscsi_discovery
-sbin/iscsi-iname usr/sbin/iscsi-iname
diff -urpN a/debian/open-iscsi.postinst b/debian/open-iscsi.postinst
--- a/debian/open-iscsi.postinst 2015-10-21 11:49:30.000000000 +0200
+++ b/debian/open-iscsi.postinst 2016-01-07 22:35:25.000000000 +0100
@@ -61,6 +61,13 @@ case "$1" in
fi
fi
+ # Compatibility symlinks
+ for file in iscsid iscsi_discovery iscsi-iname iscsistart; do
+ if [ ! -e /usr/sbin/$file ]; then
+ ln -s /sbin/$file /usr/sbin/$file
+ fi
+ done
+
# Obsolete: only open-iscsi 1.0, never even shipped with any
# stable Debian release. But postinst up to Jessie still
# created this directory, so keep this until at least Stretch.
diff -urpN a/debian/open-iscsi.postrm b/debian/open-iscsi.postrm
--- a/debian/open-iscsi.postrm 2015-10-21 11:49:30.000000000 +0200
+++ b/debian/open-iscsi.postrm 2016-01-07 22:37:24.000000000 +0100
@@ -10,7 +10,15 @@ case "$1" in
fi
;;
- remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ remove)
+ for file in iscsid iscsi_discovery iscsi-iname iscsistart; do
+ if [ -L /usr/sbin/$file ]; then
+ rm /usr/sbin/$file
+ fi
+ done
+ ;;
+
+ upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
;;
*)
signature.asc
Description: PGP signature
