> Thank you very much for your research and patches. Can you please > re-submit your patches in format, generated by `git format-patch'? > > What you included is `git show` output, which is not possible to apply > directly. Thank you again.
Here you go. -- Pierre Ynard
From 289d898ca707be223d4220951cdc3753d21e2df6 Mon Sep 17 00:00:00 2001 From: Pierre Ynard <linkfa...@yahoo.fr> Date: Sun, 24 Feb 2019 17:29:36 +0100 Subject: [PATCH 1/2] Remove write-only variable left over from legacy migration postinst code The code using that workaround is long gone. --- debian/initscripts.postinst | 6 ------ 1 file changed, 6 deletions(-) diff --git a/debian/initscripts.postinst b/debian/initscripts.postinst index c6ac94d..4ed27ec 100755 --- a/debian/initscripts.postinst +++ b/debian/initscripts.postinst @@ -9,12 +9,6 @@ set -e . /lib/init/tmpfs.sh . /lib/init/mount-functions.sh -# Set this as a variable to hide from lintian the fact that we're removing -# it; otherwise, a wrong lintian check + ftp fatal autoreject prevents us -# from uploading this legitimate code, even though the previous upload was -# accepted without incident. -devshm=/dev/shm - case "$1" in configure) PREV_VER=$2 -- 2.1.4
From 2f1e2ebf9e6154acabb419789ee193678e221300 Mon Sep 17 00:00:00 2001 From: Pierre Ynard <linkfa...@yahoo.fr> Date: Sun, 24 Feb 2019 17:39:16 +0100 Subject: [PATCH 2/2] Clean up unused leftover legacy migration code from postinst The postinst code using this was long cleaned up itself. --- debian/initscripts.postinst | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/debian/initscripts.postinst b/debian/initscripts.postinst index 4ed27ec..ad0eb4d 100755 --- a/debian/initscripts.postinst +++ b/debian/initscripts.postinst @@ -20,40 +20,6 @@ esac umask 022 -compat_link () { - SRC=$1 - DEST=$2 - - ssrc="$(stat -L --format="%d %i" "$SRC" 2>/dev/null || :)" - sdest="$(stat -L --format="%d %i" "$DEST" 2>/dev/null || :)" - - if [ -n "$ssrc" ] && [ "$ssrc" != "$sdest" ]; then - echo "guest environment detected: Linking $DEST to $SRC" - ( - if [ -e $DEST ]; then - if [ -L $DEST ]; then - echo "$DEST is already a symlink; not replacing with link to $SRC" - exit 0 - elif [ -d $DEST ]; then - rmdir $DEST || exit 1 - else - echo "$DEST isn't a directory or a symlink" - exit 1 - fi - fi - ln -fs $SRC $DEST - ) || { - echo "Can't symlink $DEST to $SRC; please fix manually." - return 1 - } - if which restorecon >/dev/null 2>&1; then - restorecon "$DEST" - fi - fi - - return 0 -} - # In 2.88dsf-23 the "mountoverflowtmp" script was dropped entirely. if dpkg --compare-versions "$PREV_VER" lt-nl "2.88dsf-23" ; then update-rc.d -f mountoverflowtmp remove >/dev/null -- 2.1.4