diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/virt-manager/PKGBUILD | 13 | ||||
| -rw-r--r-- | libre/virt-manager/libre.patch | 155 |
2 files changed, 162 insertions, 6 deletions
diff --git a/libre/virt-manager/PKGBUILD b/libre/virt-manager/PKGBUILD index 1f0192181..82a8a62a0 100644 --- a/libre/virt-manager/PKGBUILD +++ b/libre/virt-manager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188575 2016-09-05 12:59:33Z spupykin $ +# $Id: PKGBUILD 195858 2016-11-14 17:58:58Z spupykin $ # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor (Arch): Daniel Micay <danielmicay@gmail.com> # Contributor (Arch): Jonathan Wiersma <archaur at jonw dot org> @@ -7,7 +7,7 @@ pkgbase=virt-manager pkgname=virt-install pkgver=1.4.0 -pkgrel=2.parabola2 +pkgrel=2.parabola3 pkgdesc="Console user interface for managing virtual machines, without support for nonfree systems" arch=('any') url="http://virt-manager.org/" @@ -20,14 +20,17 @@ makedepends=('intltool>=0.35.0' 'python2-ipy' 'newt-syrup' 'openbsd-netcat' 'x11-ssh-askpass' 'graphite' 'spice-gtk3' 'libvirt-glib' 'vte3') -source=("http://virt-manager.org/download/sources/virt-manager/virt-manager-$pkgver.tar.gz" +source=("https://virt-manager.org/download/sources/virt-manager/virt-manager-$pkgver.tar.gz" 'libre.patch') -md5sums=('3cb69f1d108ae6d16bab2fce7ec639ea' - '80eabf875d10704fb0e3881cc0b8d971') +sha256sums=('bf31a40cc48500cbf87a0e93a5838fc3f6ce4e2fa03f8bce6aa2615625e6caca' + 'fcc47de76956ebf66386ad80c6836df72622d8fdc4eca98cbbacf6fc87d251a3') prepare() { cd "$srcdir/$pkgbase-$pkgver" patch -p1 -i ../libre.patch + sed -i '\|msgid ["]Linux["]| s|Linux|GNU/Linux|g + \|msgstr ["]Linux["]| s|Linux|GNU/Linux|g + ' po/* } build() { diff --git a/libre/virt-manager/libre.patch b/libre/virt-manager/libre.patch index 21f2ba5ef..6f20d008d 100644 --- a/libre/virt-manager/libre.patch +++ b/libre/virt-manager/libre.patch @@ -1,5 +1,5 @@ diff --git a/man/virt-install.pod b/man/virt-install.pod -index a1229c8..7177ab2 100644 +index a1229c8..4c7b0e3 100644 --- a/man/virt-install.pod +++ b/man/virt-install.pod @@ -357,36 +357,6 @@ Mount the ISO and probe the directory. This requires running virt-install as roo @@ -39,6 +39,159 @@ index a1229c8..7177ab2 100644 =item B<--pxe> Use the PXE boot protocol to load the initial ramdisk and kernel for starting +@@ -421,21 +391,6 @@ file: + + --initrd-inject=/path/to/my.ks --extra-args "ks=file:/my.ks" + +-=item B<--os-variant> OS_VARIANT +- +-Optimize the guest configuration for a specific operating system (ex. +-'fedora18', 'rhel7', 'winxp'). While not required, specifying this +-options is HIGHLY RECOMMENDED, as it can greatly increase performance +-by specifying virtio among other guest tweaks. +- +-By default, virt-install will attempt to auto detect this value from +-the install media (currently only supported for URL installs). Autodetection +-can be disabled with the special value 'none'. Autodetection can be +-forced with the special value 'auto'. +- +-Use the command "osinfo-query os" to get the list of the accepted OS +-variants. +- + =item B<--boot> BOOTOPTS + + Optionally specify the post-install VM boot configuration. This option allows +@@ -592,7 +547,7 @@ bus types. + + =item B<removable> + +-Sets the removable flag (/sys/block/$dev/removable on Linux). Only ++Sets the removable flag (/sys/block/$dev/removable on GNU/Linux). Only + used with QEMU and bus=usb. Value can be 'on' or 'off'. + + =item B<readonly> +@@ -672,7 +627,7 @@ How guest should react if a write error is encountered. Can be one of + + =item B<serial> + +-Serial number of the emulated disk device. This is used in linux guests ++Serial number of the emulated disk device. This is used in GNU/Linux guests + to set /dev/disk/by-id symlinks. An example serial number might be: + WD-WMAP9A966149 + +@@ -695,7 +650,7 @@ invocation is: + + --filesystem /source/on/host,/target/point/in/guest + +-Which will work for recent QEMU and linux guest OS or LXC containers. For ++Which will work for recent QEMU and GNU/Linux guest OS or LXC Linux containers. For + QEMU, the target point is just a mounting hint in sysfs, so will not be + automatically mounted. + +@@ -1635,45 +1590,6 @@ C<~/.cache/virt-manager/virt-install.log> even if this parameter is omitted. + + =head1 EXAMPLES + +-Install a Fedora 20 KVM guest with virtio accelerated disk/network, +-creating a new 10GiB qcow2 file, installing from media in the hosts +-CDROM drive. This will use Spice graphics by default, and launch autolaunch +-a graphical client. +- +- # virt-install \ +- --connect qemu:///system \ +- --virt-type kvm \ +- --name demo \ +- --memory 500 \ +- --disk size=10 \ +- --cdrom /dev/cdrom \ +- --os-variant fedora13 +- +-Install a Fedora 9 plain QEMU guest, using LVM partition, virtual networking, +-booting from PXE, using VNC server/viewer, with virtio-scsi disk +- +- # virt-install \ +- --connect qemu:///system \ +- --name demo \ +- --memory 500 \ +- --disk path=/dev/HostVG/DemoVM,bus=scsi \ +- --controller virtio-scsi \ +- --network network=default \ +- --virt-type qemu +- --graphics vnc \ +- --os-variant fedora9 +- +-Run a Live CD image under Xen fullyvirt, in diskless environment +- +- # virt-install \ +- --hvm \ +- --name demo \ +- --memory 500 \ +- --disk none \ +- --livecd \ +- --graphics vnc \ +- --cdrom /root/fedora7live.iso +- + Run /usr/bin/httpd in a linux container guest (LXC). Resource usage is capped + at 512 MiB of ram and 2 host cpus: + +@@ -1699,7 +1615,7 @@ The host dir "/home/test" will be mounted at + --init /bin/sh + + Install a paravirtualized Xen guest, 500 MiB of RAM, a 5 GiB of disk, and +-Fedora Core 6 from a web server, in text-only mode, with old style --file ++Parabola from a web server, in text-only mode, with old style --file + options: + + # virt-install \ +@@ -1708,7 +1624,7 @@ options: + --memory 500 \ + --disk /var/lib/xen/images/demo.img,size=6 \ + --graphics none \ +- --location http://download.fedora.redhat.com/pub/fedora/linux/core/6/x86_64/os/ ++ --location https://repo.parabola.nu/iso/latest/ + + Create a guest from an existing disk image 'mydisk.img' using defaults for + the rest of the options. +diff --git a/virtManager/connection.py b/virtManager/connection.py +index 6cb9cc0..21de8cf 100644 +--- a/virtManager/connection.py ++++ b/virtManager/connection.py +@@ -642,8 +642,8 @@ class vmmConnection(vmmGObject): + continue + + if (devtype == "usb_device" and +- (("Linux Foundation" in str(xmlobj.vendor_name) or +- ("Linux" in str(xmlobj.vendor_name) and ++ (("Free Software Foundation" in str(xmlobj.vendor_name) or ++ ("GNU/Linux" in str(xmlobj.vendor_name) and + xmlobj.vendor_id == "0x1d6b")) and + ("root hub" in str(xmlobj.product_name) or + ("host controller" in str(xmlobj.product_name).lower() and +diff --git a/virtManager/create.py b/virtManager/create.py +index 737c1fa..4ff52ec 100644 +--- a/virtManager/create.py ++++ b/virtManager/create.py +@@ -1077,7 +1077,7 @@ class vmmCreate(vmmGObjectUI): + osstr = "" + have_os = True + if self._guest.os.is_container(): +- osstr = _("Linux") ++ osstr = _("GNU/Linux") + elif not distro: + osstr = _("Generic") + have_os = False +diff --git a/virtinst/guest.py b/virtinst/guest.py +index 6a42536..e774d47 100644 +--- a/virtinst/guest.py ++++ b/virtinst/guest.py +@@ -608,7 +608,6 @@ class Guest(XMLBuilder): + return + + if (self.conn.is_qemu() and +- self._os_object.supports_qemu_ga() and + self.conn.check_support(self.conn.SUPPORT_CONN_AUTOSOCKET)): + dev = VirtualChannelDevice(self.conn) + dev.type = "unix" diff --git a/virtinst/osdict.py b/virtinst/osdict.py index e8c1487..5f220f6 100644 --- a/virtinst/osdict.py |