diff --git a/1000-force-virtio_blk-in-old-guest-kernel.patch b/1000-force-virtio_blk-in-old-guest-kernel.patch index 3d2fcf9..193af6e 100644 --- a/1000-force-virtio_blk-in-old-guest-kernel.patch +++ b/1000-force-virtio_blk-in-old-guest-kernel.patch @@ -17,9 +17,9 @@ Index: libguestfs-1.22.5/fish/options.c --- libguestfs-1.22.5.orig/fish/options.c +++ libguestfs-1.22.5/fish/options.c @@ -286,7 +286,10 @@ add_drives (struct drv *drv, char next_d + { int r; struct guestfs_add_drive_opts_argv ad_optargs; - char **server; - + int use_virtio_blk = 0; +#ifdef GUESTFS_QEMU_NO_VIRTIO_BLK diff --git a/libguestfs-1.22.5.tar.xz b/libguestfs-1.22.5.tar.xz deleted file mode 100644 index 8671aca..0000000 --- a/libguestfs-1.22.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25d693128110a8936d7686d5f36308dc229ed1f7db6448f143497104cc895e9c -size 4148564 diff --git a/libguestfs-1.22.6.tar.xz b/libguestfs-1.22.6.tar.xz new file mode 100644 index 0000000..1aa20d7 --- /dev/null +++ b/libguestfs-1.22.6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f538cd2fbead971fe82044d013303aee285a518fbe20183a9f85ca9132183fbd +size 4159296 diff --git a/libguestfs.changes b/libguestfs.changes index 8fcd7e1..1e7b39b 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,51 @@ +------------------------------------------------------------------- +Mon Sep 23 15:35:28 CEST 2013 - ohering@suse.de + +- Remove BuildRequires: qemu-tools + +------------------------------------------------------------------- +Mon Sep 23 11:40:31 CEST 2013 - ohering@suse.de + +- Add static 169.254.0.0/16 network addresses (bnc#835949) + +------------------------------------------------------------------- +Thu Sep 19 20:20:44 CEST 2013 - ohering@suse.de + +- Update to version 1.22.6 + * Initialize CLEANUP_* stack variables with NULL in various places. + * daemon: sh: Fix missing initializer which caused segfault (RHBZ#1000121). + * fish: Document that guestfish --remote --add won't work as expected (RHBZ#998513). + * launch: direct: Don't try to wait for qemu if parent process forked (RHBZ#998482). + * list-filesystems: Don't fail if there are no filesystems found (RHBZ#995711). + * virt-list-filesystems: Fix to use $g->canonical_device_name instead of homebrew function. + * daemon: If /proc/modules doesn't exist, linuxmodules optgroup is disabled. + * launch: direct: Print \n after printing qemu command line. + * conn: Make sure we display all log messages when qemu goes away. + * lib: Turn 'random_chars' function used by libvirt backend into utility function. + * daemon: ldm: Don't return an error if /dev/mapper doesn't exist. + * daemon: Move all RESOLVE macros to daemon/stubs.c. + * proto: Fix --enable-packet-dump mode. + * daemon: Close augeas, hivex handles in unmount_all. + * Fix parsing of boot flag in do_part_get_bootable() + * Update gnulib to latest version. + * augeas: Improve error reporting. + * launch: direct: Add drives after machine parameters. + * fish: Fix guestfish so it can recognize sheepdog://... as a valid URI. + * resize: Move isatty_stdout function to separate module (TTY.isatty_stdout). + * daemon: cap-get-file: Return empty string if no capability on file (RHBZ#989356). + * src/file.c: Be sure to call guestfs___lazy_make_tmpdir before using g->tmpdir. + * generator: Fix the case where a daemon function has one FileIn/FileOut parameter and no other parameters. + +------------------------------------------------------------------- +Thu Sep 19 15:43:53 CEST 2013 - ohering@suse.de + +- Create symlink from /etc/mtab to /proc/self/mounts (bnc#840662) + +------------------------------------------------------------------- +Mon Sep 2 13:59:21 CEST 2013 - dvaleev@suse.com + +- add ppc64 to Exclusive arch + ------------------------------------------------------------------- Thu Aug 29 21:36:08 CEST 2013 - ohering@suse.de diff --git a/libguestfs.mkinitrd.boot.sh b/libguestfs.mkinitrd.boot.sh index 5944886..787e3f5 100644 --- a/libguestfs.mkinitrd.boot.sh +++ b/libguestfs.mkinitrd.boot.sh @@ -87,6 +87,7 @@ #%programs: modprobe #%programs: lvm #%programs: grep +#%programs: ln #%programs: ls #%programs: head #%programs: cat @@ -112,6 +113,8 @@ missing_commands="@GUESTFS_MISSING_CMDS@" # run_all.sh will load them after this script is sourced load_modules +ln -sfbn ../proc/self/mounts /etc/mtab + # from libguestfs-1.19.34/appliance/init: # Disk optimizations. @@ -120,6 +123,15 @@ for f in /sys/block/sd*/device/timeout; do if test -w $f ; then echo 300 > $f; f # https://access.redhat.com/site/solutions/5427 for f in /sys/block/{h,s,ub,v}d*/queue/scheduler; do if test -w $f ; then echo noop > $f; fi; done +# Set up the network. +ip addr add 127.0.0.1/8 brd + dev lo scope host +ip link set dev lo up + +ip addr add 169.254.2.10/16 brd + dev eth0 scope global +ip link set dev eth0 up + +ip route add default via 169.254.2.2 + # Scan for MDs. mdadm -As --auto=yes --run diff --git a/libguestfs.spec b/libguestfs.spec index c1a5705..3e4df53 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -17,7 +17,7 @@ # -Version: 1.22.5 +Version: 1.22.6 Release: 0 %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) @@ -93,9 +93,8 @@ Release: 0 %define guestfs_docdir %{_defaultdocdir}/%{name} # Name: libguestfs -BuildRequires: qemu-tools %if "%{?_ignore_exclusive_arch}" == "" -ExclusiveArch: %ix86 x86_64 +ExclusiveArch: %ix86 x86_64 ppc64 %endif BuildRequires: aaa_base BuildRequires: attr-devel