preseed.cfg taken from upstream, /etc/default/spice-vdagentd removed

ruzickap · May 3, 2018 · d847eb2 · d847eb2
1 parent e6413cc
commit d847eb2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 17 deletions.
diff --git a/http/ubuntu-desktop/preseed.cfg b/http/ubuntu-desktop/preseed.cfg
@@ -1,4 +1,4 @@
-#### Contents of the preconfiguration file (for xenial)
+#### Contents of the preconfiguration file (for stretch)
 ### Localization
 # Preseeding only locale sets language, country and locale.
 d-i debian-installer/locale string en_US
@@ -113,9 +113,9 @@ d-i mirror/http/proxy string
 #d-i mirror/http/mirror select CC.archive.ubuntu.com
 
 # Suite to install.
-#d-i mirror/suite string xenial
+#d-i mirror/suite string stretch
 # Suite to use for loading installer components (optional).
-#d-i mirror/udeb/suite string xenial
+#d-i mirror/udeb/suite string stretch
 # Components to use for loading installer components (optional).
 #d-i mirror/udeb/components multiselect main, restricted
 
@@ -348,7 +348,7 @@ d-i partman/confirm_nooverwrite boolean true
 
 # Additional repositories, local[0-9] available
 #d-i apt-setup/local0/repository string \
-#       http://local.server/ubuntu xenial main
+#       http://local.server/ubuntu stretch main
 #d-i apt-setup/local0/comment string local server
 # Enable deb-src lines
 #d-i apt-setup/local0/source boolean true
@@ -370,7 +370,6 @@ d-i partman/confirm_nooverwrite boolean true
 tasksel tasksel/first multiselect ubuntu-desktop
 #tasksel tasksel/first multiselect lamp-server, print-server
 #tasksel tasksel/first multiselect kubuntu-desktop
-#tasksel tasksel/first multiselect none
 
 # Individual additional packages to install
 #d-i pkgsel/include string openssh-server build-essential

diff --git a/http/ubuntu-server/my-preseed.cfg b/http/ubuntu-server/my-preseed.cfg
@@ -1,4 +1,4 @@
-#### Contents of the preconfiguration file (for xenial)
+#### Contents of the preconfiguration file (for stretch)
 ### Localization
 # Preseeding only locale sets language, country and locale.
 d-i debian-installer/locale string en_US
@@ -114,9 +114,9 @@ d-i mirror/http/proxy string
 #d-i mirror/http/mirror select CC.archive.ubuntu.com
 
 # Suite to install.
-#d-i mirror/suite string xenial
+#d-i mirror/suite string stretch
 # Suite to use for loading installer components (optional).
-#d-i mirror/udeb/suite string xenial
+#d-i mirror/udeb/suite string stretch
 # Components to use for loading installer components (optional).
 #d-i mirror/udeb/components multiselect main, restricted
 
@@ -349,7 +349,7 @@ d-i apt-setup/backports boolean true
 
 # Additional repositories, local[0-9] available
 #d-i apt-setup/local0/repository string \
-#       http://local.server/ubuntu xenial main
+#       http://local.server/ubuntu stretch main
 #d-i apt-setup/local0/comment string local server
 # Enable deb-src lines
 #d-i apt-setup/local0/source boolean true

diff --git a/http/ubuntu-server/preseed.cfg b/http/ubuntu-server/preseed.cfg
@@ -1,4 +1,4 @@
-#### Contents of the preconfiguration file (for xenial)
+#### Contents of the preconfiguration file (for stretch)
 ### Localization
 # Preseeding only locale sets language, country and locale.
 d-i debian-installer/locale string en_US
@@ -113,9 +113,9 @@ d-i mirror/http/proxy string
 #d-i mirror/http/mirror select CC.archive.ubuntu.com
 
 # Suite to install.
-#d-i mirror/suite string xenial
+#d-i mirror/suite string stretch
 # Suite to use for loading installer components (optional).
-#d-i mirror/udeb/suite string xenial
+#d-i mirror/udeb/suite string stretch
 # Components to use for loading installer components (optional).
 #d-i mirror/udeb/components multiselect main, restricted
 
@@ -348,7 +348,7 @@ d-i partman/confirm_nooverwrite boolean true
 
 # Additional repositories, local[0-9] available
 #d-i apt-setup/local0/repository string \
-#       http://local.server/ubuntu xenial main
+#       http://local.server/ubuntu stretch main
 #d-i apt-setup/local0/comment string local server
 # Enable deb-src lines
 #d-i apt-setup/local0/source boolean true

diff --git a/scripts/ubuntu/spice-vdagent.sh b/scripts/ubuntu/spice-vdagent.sh
@@ -1,12 +1,8 @@
 #!/bin/bash -eux
 
-
 if grep -q QEMU /proc/scsi/scsi; then
   echo "*** Installing spice-vdagent"
 
   export DEBIAN_FRONTEND="noninteractive"
   apt-get install -y -qq --no-install-recommends spice-vdagent
-
-  # https://bugs.launchpad.net/ubuntu/+source/spice-vdagent/+bug/1633609
-  echo 'SPICE_VDAGENTD_EXTRA_ARGS="-X"' > /etc/default/spice-vdagentd
 fi