[X2Go-Commits] [x2gothinclient] 03/03: management/sbin/x2gothinclient_create: Stop using deprecated --force-yes.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gothinclient.

commit 67ea8a57a9bf428491af30952d5807b9dd7de54c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Nov 23 21:41:10 2018 +0100

    management/sbin/x2gothinclient_create: Stop using deprecated --force-yes.
---
 debian/changelog                      | 1 +
 management/sbin/x2gothinclient_create | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 32927f4..2663f56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -71,6 +71,7 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low
     - management/sbin/x2gothinclient_update: Consider known_hosts2 FreeRDP host
       key files, known_hosts was used for FreeRDP v1.x and are in fact
       deprecated nowadays.
+    - management/sbin/x2gothinclient_create: Stop using deprecated --force-yes.
   * debian/control:
     + Rename bin:package: x2gothinclient -> x2gothinclient-daemon.
     + Make sure x2gothinclient-minidesktop pulls in X11 and X2Go Client.
diff --git a/management/sbin/x2gothinclient_create b/management/sbin/x2gothinclient_create
index 4184f23..c044a11 100755
--- a/management/sbin/x2gothinclient_create
+++ b/management/sbin/x2gothinclient_create
@@ -199,7 +199,7 @@ export X2GO_HANDLE_DAEMONS=false
 
 [ \$? -eq 0 ] && test -n "$TC_X2GO_DEBURL" && echo "$TC_X2GO_DEBURL" > /etc/apt/sources.list.d/x2go.list
 [ \$? -eq 0 ] && test -n "$TC_X2GO_DEBURL" && apt-get update
-[ \$? -eq 0 ] && test -n "$TC_X2GO_DEBURL" && apt-get install x2go-keyring -y --force-yes
+[ \$? -eq 0 ] && test -n "$TC_X2GO_DEBURL" && apt-get install x2go-keyring -y
 
 # tweak mtab diversion
 [ \$? -eq 0 ] && rm -f /etc/mtab
@@ -217,7 +217,7 @@ fi
 [ \$? -eq 0 ] && test -h /initrd.img && mv /initrd.img /initrd.img.$KERNEL_VERSION.tmp || true
 [ \$? -eq 0 ] && LINK_TARGET=\$(readlink /initrd.img.$KERNEL_VERSION.tmp | sed 's@/boot at boot@') && ln -sf \$LINK_TARGET /initrd.img.$KERNEL_VERSION && rm -f /initrd.img.$KERNEL_VERSION.tmp
 
-[ \$? -eq 0 ] && apt-get install x2gothinclient-chroot x2gothinclient-${TC_FLAVOUR} -y --force-yes
+[ \$? -eq 0 ] && apt-get install x2gothinclient-chroot x2gothinclient-${TC_FLAVOUR} -y
 
 
 # blacklist kernel modules

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git