Hello community, here is the log from the commit of package kexec-tools for openSUSE:Factory checked in at 2014-02-22 20:44:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kexec-tools (Old) and /work/SRC/openSUSE:Factory/.kexec-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kexec-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/kexec-tools/kexec-tools.changes 2014-02-11 11:39:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kexec-tools.new/kexec-tools.changes 2014-02-22 20:44:32.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Feb 6 01:14:24 UTC 2014 - [email protected] + +- Drop obsolete /etc/init.d/kexec (bnc# 862143). +- Handle btrfs root subvolume (bnc# 862143c35) +- Create kexec-load.service (bnc# 862143) +- Update kexec-bootloader manpage (document reboot using kexec) +- Remove old 11.1 conditionals +- Update kexec-tools-i386-bzimage_efi.patch and + kexec-tools-xen-e820-redefinition.patch with upstream commit ids + +------------------------------------------------------------------- Old: ---- kexec.init New: ---- kexec-load.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kexec-tools.spec ++++++ --- /var/tmp/diff_new_pack.GpO9ac/_old 2014-02-22 20:44:33.000000000 +0100 +++ /var/tmp/diff_new_pack.GpO9ac/_new 2014-02-22 20:44:33.000000000 +0100 @@ -31,7 +31,7 @@ Source: ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz Source1: kexec-bootloader Source2: kexec-bootloader.8.txt -Source3: kexec.init +Source3: kexec-load.service Source4: %{name}-rpmlintrc Patch1: %{name}-xen-static.patch Patch2: %{name}-xen-balloon-up.patch @@ -43,12 +43,10 @@ Url: ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build #!BuildIgnore: fop -BuildRequires: automake -BuildRequires: zlib-devel -%if 0%{?suse_version} >= 1110 BuildRequires: asciidoc +BuildRequires: automake BuildRequires: libxslt -%endif +BuildRequires: zlib-devel %ifarch x86_64 BuildRequires: xen-devel %endif @@ -85,24 +83,17 @@ %configure %endif make -cp %{S:1} . -cp %{S:2} . -cp %{S:3} . -%if 0%{?suse_version} >= 1110 -a2x -d manpage -f manpage kexec-bootloader.8.txt -%endif +a2x -D . -d manpage -f manpage %{S:2} %install %makeinstall mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 install -c -m 0644 kexec/kexec.8 $RPM_BUILD_ROOT%{_mandir}/man8 -%if 0%{?suse_version} >= 1110 install -c -m 0644 kexec-bootloader.8 $RPM_BUILD_ROOT%{_mandir}/man8 mkdir -p $RPM_BUILD_ROOT%{_sbindir} -install -m 0755 kexec-bootloader $RPM_BUILD_ROOT%{_sbindir} -mkdir -p ${RPM_BUILD_ROOT}/etc/init.d -install -m 0755 kexec.init ${RPM_BUILD_ROOT}/etc/init.d/kexec -%endif +install -m 0755 %{S:1} $RPM_BUILD_ROOT%{_sbindir} +mkdir -p $RPM_BUILD_ROOT%{_unitdir} +install -m644 %{S:3} $RPM_BUILD_ROOT%{_unitdir} #UsrMerge mkdir -p $RPM_BUILD_ROOT/sbin ln -s %{_sbindir}/kdump $RPM_BUILD_ROOT/sbin @@ -111,17 +102,18 @@ %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -%if 0%{?suse_version} >= 1110 %post -%{fillup_and_insserv -n kexec kexec} -%endif -# +%service_add_post kexec-load.service %postun -%if 0%{?suse_version} >= 1110 -%insserv_cleanup -%endif +%service_del_postun kexec-load.service + +%pre +%service_add_pre kexec-load.service + +%preun +%service_del_preun kexec-load.service %files %defattr(-, root, root) @@ -131,9 +123,7 @@ /sbin/* #EndUsrMerge %{_sbindir}/* -%if 0%{?suse_version} >= 1110 %{_sbindir}/kexec-bootloader -%config /etc/init.d/kexec -%endif +%{_unitdir}/kexec-load.service %changelog ++++++ kexec-bootloader ++++++ --- /var/tmp/diff_new_pack.GpO9ac/_old 2014-02-22 20:44:33.000000000 +0100 +++ /var/tmp/diff_new_pack.GpO9ac/_new 2014-02-22 20:44:33.000000000 +0100 @@ -149,11 +149,22 @@ exit(1); } +my $image=$section->{"image"}; +my $initrd=$section->{"initrd"}; + +# handle btfs /@ -> / +if (substr ($image, 0, 3) eq "/@/") { + $image = substr ($image, 2); +} +if ($initrd && substr ($initrd, 0, 3) eq "/@/") { + $initrd = substr ($initrd, 2); +} + if ($debug) { print "Type : " . $section->{"type"}."\n"; print "Name : " . $section->{"name"}."\n"; - print "Image : " . $section->{"image"}."\n"; - print "Initrd : " . $section->{"initrd"}."\n"; + print "Image : " . $image."\n"; + print "Initrd : " . $initrd."\n"; print "VGA : " . $section->{"vgamode"}."\n"; print "Append : " . $section->{"append"}."\n"; print "Root : " . $section->{"root"}."\n"; @@ -164,15 +175,16 @@ exit(1); } + # check if the image exists -if (! -f $section->{"image"}) { - print STDERR "Image '" . $section->{"image"} . "' does not exist.\n"; +if (! -f $image) { + print STDERR "Image '" . $image . "' does not exist.\n"; exit(1); } # check if the initrd exists -if ($section->{"initrd"} && ! -f $section->{"initrd"}) { - print STDERR "Initrd '" . $section->{"initrd"} . "' does not exist.\n"; +if ($initrd && ! -f $initrd) { + print STDERR "Initrd '" . $initrd . "' does not exist.\n"; exit(1); } @@ -186,11 +198,11 @@ my $cmd = "kexec"; # append image -$cmd .= " -l '" . $section->{"image"} . "'"; +$cmd .= " -l '" . $image . "'"; # append initrd if available -if ($section->{"initrd"}) { - $cmd .= " --initrd='" . $section->{"initrd"} . "'"; +if ($initrd) { + $cmd .= " --initrd='" . $initrd . "'"; } # build append line ++++++ kexec-bootloader.8.txt ++++++ --- /var/tmp/diff_new_pack.GpO9ac/_old 2014-02-22 20:44:33.000000000 +0100 +++ /var/tmp/diff_new_pack.GpO9ac/_new 2014-02-22 20:44:33.000000000 +0100 @@ -48,6 +48,12 @@ kexec-bootloader takes the default section of bootloader configuration and loads that kernel, initrd with _kexec -l_ and the respective command line. +Under systemd kexec-bootloader may be invoked by kexec-load.service +(/usr/bin/systemctl kexec) to perform a kexec. To emulate previous SLE +configurable behaviour where kexec occurs automatically at system reboot +the systemd reboot target should be altered via +'ln -s /usr/lib/systemd/system/kexec.target /etc/systemd/system/reboot.target + Options ------- *-h* | *--help*:: ++++++ kexec-load.service ++++++ [Unit] Description=load default kernel into the current kernel Documentation=man:kexec(8) DefaultDependencies=no Before=shutdown.target umount.target final.target [Service] Type=oneshot ExecStart=/usr/sbin/kexec-bootloader [Install] WantedBy=kexec.target ++++++ kexec-tools-i386-bzimage_efi.patch ++++++ --- /var/tmp/diff_new_pack.GpO9ac/_old 2014-02-22 20:44:33.000000000 +0100 +++ /var/tmp/diff_new_pack.GpO9ac/_new 2014-02-22 20:44:33.000000000 +0100 @@ -1,11 +1,13 @@ From: Tony Jones <[email protected]> -Subject: fix build error on i386 -Upstream: pending +Subject: i386: fix build failure (bzImage_support_efi_boot) +Upstream: yes +Git-commit: 9bcefc97bc6c03b6acc8c25f6b1d4e796521ea4c Commit 9c200a85de2245a850546fded96a1977b84ad24d referenced 'bzImage_support_efi_boot' without matching 32-bit definition. Signed-off-by: Tony Jones <[email protected]> +Signed-off-by: Simon Horman <[email protected]> --- kexec/arch/i386/kexec-bzImage.c | 1 + 1 file changed, 1 insertion(+) ++++++ kexec-tools-xen-e820-redefinition.patch ++++++ --- /var/tmp/diff_new_pack.GpO9ac/_old 2014-02-22 20:44:33.000000000 +0100 +++ /var/tmp/diff_new_pack.GpO9ac/_new 2014-02-22 20:44:33.000000000 +0100 @@ -1,8 +1,13 @@ From: Tony Jones <[email protected]> Subject: fix redefinition error for e820 -Upstream: pending +Upstream: yes +Git-commit: 941fa1f6e31bc7cb1b014277de36b80425da7010 -Our xenctrl.h duplicates e820 definition. +At least on our systems, xenctrl.h defines (unguarded) struct e820entry +Move the (guarded) definition in include/x86/x86-linux.h to below. + +Signed-off-by: Tony Jones <[email protected]> +Signed-off-by: Simon Horman <[email protected]> --- kexec/arch/i386/crashdump-x86.c | 3 ++- -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
