From 865baae3de3ff2485a0dbe567758cf90e64bdd2a Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 21 Sep 2012 23:56:45 +0200 Subject: [PATCH 01/17] new upstream release --- 90-default.preset | 1 - 90-display-manager.preset | 10 ++++++++++ sources | 2 +- systemd.spec | 9 ++++++++- 4 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 90-display-manager.preset diff --git a/90-default.preset b/90-default.preset index 58a92e3..4ca793a 100644 --- a/90-default.preset +++ b/90-default.preset @@ -69,7 +69,6 @@ enable xenconsoled.service enable accounts-daemon.service enable rtkit-daemon.service enable upower.service -enable gdm.service enable udisks2.service enable polkit.service enable packagekit-offline-update.service diff --git a/90-display-manager.preset b/90-display-manager.preset new file mode 100644 index 0000000..c1d3069 --- /dev/null +++ b/90-display-manager.preset @@ -0,0 +1,10 @@ +# We enable all display managers by default. Since only one can +# actually be enabled at the same time the one which is installed +# first wins + +enable gdm.service +enable lightdm.service +enable slim.service +enable lxdm.service +enable kdm.service +enable xdm.service diff --git a/sources b/sources index e21ceae..4ab5444 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8b5750f0c57fb35bf2046ad42ba149d1 systemd-190.tar.xz +a5e4bfaf900a9e2480827feaf58556cb systemd-191.tar.xz diff --git a/systemd.spec b/systemd.spec index 4d4eac1..cc4a082 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,7 +21,7 @@ Url: http://www.freedesktop.org/wiki/Software/systemd # AGAIN: DO NOT BLINDLY UPDATE RAWHIDE PACKAGES TOO WHEN YOU UPDATE # THIS PACKAGE FOR A NON-RAWHIDE DEVELOPMENT DISTRIBUTION! -Version: 190 +Version: 191 Release: 1%{?gitcommit:.git%{gitcommit}}%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ @@ -73,6 +73,7 @@ Source0: http://www.freedesktop.org/software/systemd/%{name}-%{version}.t %endif # Fedora's default preset policy Source1: 90-default.preset +Source5: 90-display-manager.preset # Feodora's SysV convert script. meh. Source2: systemd-sysv-convert # Stop-gap, just to ensure things work out-of-the-box for this driver. @@ -254,6 +255,7 @@ glib-based applications using libudev functionality. /usr/bin/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-preset/ /usr/bin/mkdir -p %{buildroot}%{_prefix}/lib/systemd/user-preset/ /usr/bin/install -m 0644 %{SOURCE1} %{buildroot}%{_prefix}/lib/systemd/system-preset/ +/usr/bin/install -m 0644 %{SOURCE5} %{buildroot}%{_prefix}/lib/systemd/system-preset/ # Make sure the shutdown/sleep drop-in dirs exist /usr/bin/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-shutdown/ @@ -479,6 +481,7 @@ fi %{_prefix}/lib/tmpfiles.d/legacy.conf %{_prefix}/lib/tmpfiles.d/tmp.conf %{_prefix}/lib/systemd/system-preset/90-default.preset +%{_prefix}/lib/systemd/system-preset/90-display-manager.preset %{_sbindir}/init %{_sbindir}/reboot %{_sbindir}/halt @@ -577,6 +580,10 @@ fi %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Fri Sep 21 2012 Lennart Poettering - 191-1 +- New upstream release +- Enable all display managers by default, as discussed with Adam Williamson + * Thu Sep 20 2012 Lennart Poettering - 190-1 - New upstream release - Take possession of /etc/localtime, and remove /etc/sysconfig/clock From 1439d1a9f215bcfc22c2ea06e888156c3bd808e7 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 22 Sep 2012 00:19:20 +0200 Subject: [PATCH 02/17] Fix journal mmap header prototype definition to fix compilation on 32bi --- ...l-bring-mmap-cache-prototype-in-sync.patch | 24 +++++++++++++++++++ systemd.spec | 8 ++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 0001-journal-bring-mmap-cache-prototype-in-sync.patch diff --git a/0001-journal-bring-mmap-cache-prototype-in-sync.patch b/0001-journal-bring-mmap-cache-prototype-in-sync.patch new file mode 100644 index 0000000..353b7e8 --- /dev/null +++ b/0001-journal-bring-mmap-cache-prototype-in-sync.patch @@ -0,0 +1,24 @@ +From e2c8b07dcb50c2adf64cdfb22e4a496fc76576fb Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Sat, 22 Sep 2012 00:16:13 +0200 +Subject: [PATCH] journal: bring mmap cache prototype in sync + +--- + src/journal/mmap-cache.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/journal/mmap-cache.h b/src/journal/mmap-cache.h +index de34634..0c42fb8 100644 +--- a/src/journal/mmap-cache.h ++++ b/src/journal/mmap-cache.h +@@ -31,6 +31,6 @@ MMapCache* mmap_cache_new(void); + MMapCache* mmap_cache_ref(MMapCache *m); + MMapCache* mmap_cache_unref(MMapCache *m); + +-int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, uint64_t size, struct stat *st, void **ret); ++int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, size_t size, struct stat *st, void **ret); + void mmap_cache_close_fd(MMapCache *m, int fd); + void mmap_cache_close_context(MMapCache *m, unsigned context); +-- +1.7.12 + diff --git a/systemd.spec b/systemd.spec index cc4a082..fce2cf9 100644 --- a/systemd.spec +++ b/systemd.spec @@ -22,7 +22,7 @@ Url: http://www.freedesktop.org/wiki/Software/systemd # THIS PACKAGE FOR A NON-RAWHIDE DEVELOPMENT DISTRIBUTION! Version: 191 -Release: 1%{?gitcommit:.git%{gitcommit}}%{?dist} +Release: 2%{?gitcommit:.git%{gitcommit}}%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: A System and Service Manager @@ -81,6 +81,8 @@ Source3: udlfb.conf # Stop-gap, just to ensure things work fine with rsyslog without having to change the package right-away Source4: listen.conf +Patch1: 0001-journal-bring-mmap-cache-prototype-in-sync.patch + Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24 Provides: SysVinit = 2.86-24, sysvinit = 2.86-24 Provides: sysvinit-userspace @@ -187,6 +189,7 @@ glib-based applications using libudev functionality. %prep %setup -q %{?gitcommit:-n %{name}-git%{gitcommit}} +%patch1 -p1 %build %{?gitcommit: ./autogen.sh } @@ -580,6 +583,9 @@ fi %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Fri Sep 21 2012 Lennart Poettering - 191-2 +- Fix journal mmap header prototype definition to fix compilation on 32bit + * Fri Sep 21 2012 Lennart Poettering - 191-1 - New upstream release - Enable all display managers by default, as discussed with Adam Williamson From 132b843d2ed9fc7a5af6fdb78c5c350fc91e4b4b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 25 Sep 2012 22:57:27 +0200 Subject: [PATCH 03/17] New upstream release --- ...l-bring-mmap-cache-prototype-in-sync.patch | 24 ------------------- sources | 2 +- systemd.spec | 10 ++++---- 3 files changed, 6 insertions(+), 30 deletions(-) delete mode 100644 0001-journal-bring-mmap-cache-prototype-in-sync.patch diff --git a/0001-journal-bring-mmap-cache-prototype-in-sync.patch b/0001-journal-bring-mmap-cache-prototype-in-sync.patch deleted file mode 100644 index 353b7e8..0000000 --- a/0001-journal-bring-mmap-cache-prototype-in-sync.patch +++ /dev/null @@ -1,24 +0,0 @@ -From e2c8b07dcb50c2adf64cdfb22e4a496fc76576fb Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Sat, 22 Sep 2012 00:16:13 +0200 -Subject: [PATCH] journal: bring mmap cache prototype in sync - ---- - src/journal/mmap-cache.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/journal/mmap-cache.h b/src/journal/mmap-cache.h -index de34634..0c42fb8 100644 ---- a/src/journal/mmap-cache.h -+++ b/src/journal/mmap-cache.h -@@ -31,6 +31,6 @@ MMapCache* mmap_cache_new(void); - MMapCache* mmap_cache_ref(MMapCache *m); - MMapCache* mmap_cache_unref(MMapCache *m); - --int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, uint64_t size, struct stat *st, void **ret); -+int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, size_t size, struct stat *st, void **ret); - void mmap_cache_close_fd(MMapCache *m, int fd); - void mmap_cache_close_context(MMapCache *m, unsigned context); --- -1.7.12 - diff --git a/sources b/sources index 4ab5444..8e3f804 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a5e4bfaf900a9e2480827feaf58556cb systemd-191.tar.xz +e8692055923e87f7f9cb634d44314edb systemd-192.tar.xz diff --git a/systemd.spec b/systemd.spec index fce2cf9..c8fe60a 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,8 +21,8 @@ Url: http://www.freedesktop.org/wiki/Software/systemd # AGAIN: DO NOT BLINDLY UPDATE RAWHIDE PACKAGES TOO WHEN YOU UPDATE # THIS PACKAGE FOR A NON-RAWHIDE DEVELOPMENT DISTRIBUTION! -Version: 191 -Release: 2%{?gitcommit:.git%{gitcommit}}%{?dist} +Version: 192 +Release: 1%{?gitcommit:.git%{gitcommit}}%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: A System and Service Manager @@ -81,8 +81,6 @@ Source3: udlfb.conf # Stop-gap, just to ensure things work fine with rsyslog without having to change the package right-away Source4: listen.conf -Patch1: 0001-journal-bring-mmap-cache-prototype-in-sync.patch - Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24 Provides: SysVinit = 2.86-24, sysvinit = 2.86-24 Provides: sysvinit-userspace @@ -189,7 +187,6 @@ glib-based applications using libudev functionality. %prep %setup -q %{?gitcommit:-n %{name}-git%{gitcommit}} -%patch1 -p1 %build %{?gitcommit: ./autogen.sh } @@ -583,6 +580,9 @@ fi %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Tue Sep 25 2012 Lennart Poettering - 192-1 +- New upstream release + * Fri Sep 21 2012 Lennart Poettering - 191-2 - Fix journal mmap header prototype definition to fix compilation on 32bit From 09c9088762d79b96bb6dc3ecb3e2be8bbfb871f0 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 28 Sep 2012 02:38:31 +0200 Subject: [PATCH 04/17] New upstream release --- sources | 2 +- systemd.spec | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 8e3f804..fb4cf37 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e8692055923e87f7f9cb634d44314edb systemd-192.tar.xz +732a9de2b1d2a15cab639c987ff9e90e systemd-193.tar.xz diff --git a/systemd.spec b/systemd.spec index c8fe60a..15f34b7 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,7 +21,7 @@ Url: http://www.freedesktop.org/wiki/Software/systemd # AGAIN: DO NOT BLINDLY UPDATE RAWHIDE PACKAGES TOO WHEN YOU UPDATE # THIS PACKAGE FOR A NON-RAWHIDE DEVELOPMENT DISTRIBUTION! -Version: 192 +Version: 193 Release: 1%{?gitcommit:.git%{gitcommit}}%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ @@ -42,6 +42,7 @@ BuildRequires: xz-devel BuildRequires: kmod-devel >= 5 BuildRequires: libgcrypt-devel BuildRequires: qrencode-devel +BuildRequires: libmicrohttpd-devel BuildRequires: hwdata BuildRequires: libxslt BuildRequires: docbook-style-xsl @@ -512,6 +513,7 @@ fi %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy %{_datadir}/pkgconfig/systemd.pc %{_datadir}/pkgconfig/udev.pc +%{_datadir}/systemd/gatewayd/browse.html # Make sure we don't remove runlevel targets from F14 alpha installs, # but make sure we don't create then anew. @@ -580,6 +582,9 @@ fi %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Fri Sep 28 2012 Lennart Poettering - 193-1 +- New upstream release + * Tue Sep 25 2012 Lennart Poettering - 192-1 - New upstream release From e7318fccf082304b11019708a43a83d42fd12bd2 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 28 Sep 2012 12:29:22 +0200 Subject: [PATCH 05/17] preset: drop iptables --- 90-default.preset | 2 -- 1 file changed, 2 deletions(-) diff --git a/90-default.preset b/90-default.preset index 4ca793a..8dd812e 100644 --- a/90-default.preset +++ b/90-default.preset @@ -21,8 +21,6 @@ enable sysklogd.* # Network facing enable firewalld.service -enable iptables.service -enable ip6tables.service enable isdn.service enable libvirtd.service enable xinetd.service From 76d4ed9f7a09e9d8bc01afe0e050331895207f33 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 3 Oct 2012 14:55:04 -0400 Subject: [PATCH 06/17] new upstream --- sources | 2 +- systemd.spec | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sources b/sources index fb4cf37..e3282e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -732a9de2b1d2a15cab639c987ff9e90e systemd-193.tar.xz +0ebb73aea444693b9b86f7a76f5df23c systemd-194.tar.xz diff --git a/systemd.spec b/systemd.spec index 15f34b7..d94b3b9 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,7 +21,7 @@ Url: http://www.freedesktop.org/wiki/Software/systemd # AGAIN: DO NOT BLINDLY UPDATE RAWHIDE PACKAGES TOO WHEN YOU UPDATE # THIS PACKAGE FOR A NON-RAWHIDE DEVELOPMENT DISTRIBUTION! -Version: 193 +Version: 194 Release: 1%{?gitcommit:.git%{gitcommit}}%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ @@ -582,6 +582,11 @@ fi %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Wed Oct 3 2012 Lennart Poettering - 194-1 +- New upstream release +- https://bugzilla.redhat.com/show_bug.cgi?id=859614 +- https://bugzilla.redhat.com/show_bug.cgi?id=859655 + * Fri Sep 28 2012 Lennart Poettering - 193-1 - New upstream release From 343debbc1307e04f97a2af5e18daa3a19c270302 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 9 Oct 2012 22:19:36 +0200 Subject: [PATCH 07/17] allow detect-virt to be run by unprivileged code --- systemd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systemd.spec b/systemd.spec index d94b3b9..6e524ef 100644 --- a/systemd.spec +++ b/systemd.spec @@ -464,7 +464,7 @@ fi %{_bindir}/systemd-cgls %{_bindir}/systemd-cgtop %{_bindir}/systemd-delta -%{_bindir}/systemd-detect-virt +%caps(cap_dac_override,cap_sys_ptrace=pe) %{_bindir}/systemd-detect-virt %{_bindir}/systemd-inhibit %{_bindir}/udevadm %{_prefix}/lib/systemd/systemd From f5caa74303ad1aa4657db4ba372e3e90881f2a5b Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Wed, 10 Oct 2012 17:29:42 +0200 Subject: [PATCH 08/17] Add scriptlets for migration away from systemd-timedated-ntp.target F17 had systemd-timedated-ntp.target. The target is gone in F18. We want to ensure that users who had their NTP services enabled indirectly via the target in F17 will still have them enabled after upgrading to F18. We use the %pretrans step to record which NTP services to enable. Doing it in %pre would be too late. %pretrans has to be in lua. The actual enabling of the NTP services is done in %post. --- systemd.spec | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/systemd.spec b/systemd.spec index 6e524ef..e8662eb 100644 --- a/systemd.spec +++ b/systemd.spec @@ -22,7 +22,7 @@ Url: http://www.freedesktop.org/wiki/Software/systemd # THIS PACKAGE FOR A NON-RAWHIDE DEVELOPMENT DISTRIBUTION! Version: 194 -Release: 1%{?gitcommit:.git%{gitcommit}}%{?dist} +Release: 2%{?gitcommit:.git%{gitcommit}}%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: A System and Service Manager @@ -293,6 +293,42 @@ glib-based applications using libudev functionality. /usr/bin/mv -n %{_sysconfdir}/systemd/systemd-logind.conf %{_sysconfdir}/systemd/logind.conf >/dev/null 2>&1 || : /usr/bin/mv -n %{_sysconfdir}/systemd/systemd-journald.conf %{_sysconfdir}/systemd/journald.conf >/dev/null 2>&1 || : +%pretrans -p +--# Migrate away from systemd-timedated-ntp.target. +--# Take note which ntp services, if any, were pulled in by it. +--# We'll enable them the usual way in %%post. +--# Remove this after upgrades from F17 are no longer supported. +function migrate_ntp() + --# Are we upgrading from a version that had systemd-timedated-ntp.target? + t = posix.stat("/usr/lib/systemd/system/systemd-timedated-ntp.target", "type") + if t ~= "regular" then return end + + --# Was the target enabled? + t = posix.stat("/etc/systemd/system/multi-user.target.wants/systemd-timedated-ntp.target", "type") + if t ~= "link" then return end + + --# filesystem provides /var/lib/rpm-state since F17 GA + r,msg,errno = posix.mkdir("/var/lib/rpm-state/systemd") + if r == nil and errno ~= 17 then return end --# EEXIST is fine. + + --# Save the list of ntp services pulled by the target. + f = io.open("/var/lib/rpm-state/systemd/ntp-units", "w") + if f == nil then return end + + files = posix.dir("/usr/lib/systemd/system/systemd-timedated-ntp.target.wants") + for i,name in ipairs(files) do + if name ~= "." and name ~= ".." then + s = string.format("%s\n", name) + f:write(s) + end + end + + f:close() +end + +migrate_ntp() +return 0 + %post /usr/bin/systemd-machine-id-setup > /dev/null 2>&1 || : /usr/lib/systemd/systemd-random-seed save > /dev/null 2>&1 || : @@ -325,6 +361,18 @@ else # This systemd service does not exist anymore, we now do it # internally in PID 1 /usr/bin/rm -f /etc/systemd/system/sysinit.target.wants/hwclock-load.service >/dev/null 2>&1 || : + + # This systemd target does not exist anymore. It's been replaced + # by ntp-units.d. + /usr/bin/rm -f /etc/systemd/system/multi-user.target.wants/systemd-timedated-ntp.target >/dev/null 2>&1 || : + + # Enable the units recorded by %%pretrans + if [ -e /var/lib/rpm-state/systemd/ntp-units ] ; then + while read service; do + /usr/bin/systemctl enable "$service" >/dev/null 2>&1 || : + done < /var/lib/rpm-state/systemd/ntp-units + /usr/bin/rm -r /var/lib/rpm-state/systemd/ntp-units + fi fi # Migrate /etc/sysconfig/clock @@ -582,6 +630,9 @@ fi %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Wed Oct 10 2012 Michal Schmidt - 194-2 +- Add scriptlets for migration away from systemd-timedated-ntp.target + * Wed Oct 3 2012 Lennart Poettering - 194-1 - New upstream release - https://bugzilla.redhat.com/show_bug.cgi?id=859614 From 6695e84fa415022346ca72641c101ccdb7a42ebb Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 23 Oct 2012 02:23:22 +0200 Subject: [PATCH 09/17] New upstream release --- systemd.spec | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/systemd.spec b/systemd.spec index e8662eb..bf5f39b 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,8 +21,8 @@ Url: http://www.freedesktop.org/wiki/Software/systemd # AGAIN: DO NOT BLINDLY UPDATE RAWHIDE PACKAGES TOO WHEN YOU UPDATE # THIS PACKAGE FOR A NON-RAWHIDE DEVELOPMENT DISTRIBUTION! -Version: 194 -Release: 2%{?gitcommit:.git%{gitcommit}}%{?dist} +Version: 195 +Release: 1%{?gitcommit:.git%{gitcommit}}%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: A System and Service Manager @@ -282,6 +282,10 @@ glib-based applications using libudev functionality. # journal. /usr/bin/rm -f %{buildroot}%{_prefix}/lib/sysctl.d/coredump.conf +# For now remove /var/log/README since we are not enabling persistant +# logging yet. +/usr/bin/rm -f %{buildroot}%{_localstatedir}/log/README + %pre /usr/bin/getent group cdrom >/dev/null 2>&1 || /usr/sbin/groupadd -r -g 11 cdrom >/dev/null 2>&1 || : /usr/bin/getent group tape >/dev/null 2>&1 || /usr/sbin/groupadd -r -g 33 tape >/dev/null 2>&1 || : @@ -489,6 +493,7 @@ fi %{_sysconfdir}/bash_completion.d/systemd-bash-completion.sh %{_sysconfdir}/rpm/macros.systemd %{_sysconfdir}/xdg/systemd +%{_sysconfdir}/rc.d/init.d/README %ghost %config(noreplace) %{_sysconfdir}/hostname %ghost %config(noreplace) %{_sysconfdir}/localtime %ghost %config(noreplace) %{_sysconfdir}/vconsole.conf @@ -514,6 +519,10 @@ fi %{_bindir}/systemd-delta %caps(cap_dac_override,cap_sys_ptrace=pe) %{_bindir}/systemd-detect-virt %{_bindir}/systemd-inhibit +%{_bindir}/hostnamectl +%{_bindir}/localectl +%{_bindir}/timedatectl +%{_bindir}/systemd-coredumpctl %{_bindir}/udevadm %{_prefix}/lib/systemd/systemd %{_prefix}/lib/systemd/system @@ -630,6 +639,20 @@ fi %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Tue Oct 23 2012 Lennart Poettering - 195-1 +- New upstream release +- https://bugzilla.redhat.com/show_bug.cgi?id=831665 +- https://bugzilla.redhat.com/show_bug.cgi?id=847720 +- https://bugzilla.redhat.com/show_bug.cgi?id=858693 +- https://bugzilla.redhat.com/show_bug.cgi?id=863481 +- https://bugzilla.redhat.com/show_bug.cgi?id=864629 +- https://bugzilla.redhat.com/show_bug.cgi?id=864672 +- https://bugzilla.redhat.com/show_bug.cgi?id=864674 +- https://bugzilla.redhat.com/show_bug.cgi?id=865128 +- https://bugzilla.redhat.com/show_bug.cgi?id=866346 +- https://bugzilla.redhat.com/show_bug.cgi?id=867407 +- https://bugzilla.redhat.com/show_bug.cgi?id=868603 + * Wed Oct 10 2012 Michal Schmidt - 194-2 - Add scriptlets for migration away from systemd-timedated-ntp.target From 07f850d462ce8466e27de26a7332d48327b2f53b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 23 Oct 2012 02:25:36 +0200 Subject: [PATCH 10/17] tarball From 79b5be0ccdf41ce7ad3eb7e97ecaa1c547694133 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 23 Oct 2012 02:26:16 +0200 Subject: [PATCH 11/17] tarball From cd78e63323d6bfb4fcb8e598c69780dd7341c2e0 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 23 Oct 2012 02:26:18 +0200 Subject: [PATCH 12/17] tarball From a929b27fc41a4008cfd45c93e8ef08a689f4a1e6 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 23 Oct 2012 02:26:19 +0200 Subject: [PATCH 13/17] tarball From 8ca27515c5e2557cb4a23a2c4fb2f065183ac258 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 23 Oct 2012 02:26:21 +0200 Subject: [PATCH 14/17] tarball --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index e3282e9..eba4e64 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0ebb73aea444693b9b86f7a76f5df23c systemd-194.tar.xz +38e8c8144e7e6e5bc3ce32eb4260e680 systemd-195.tar.xz From af43dc08c9dd7c732130feb33e996258e9499193 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 24 Oct 2012 01:07:58 +0200 Subject: [PATCH 15/17] Provide syslog because the journal is fine as a syslog implementation --- systemd.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/systemd.spec b/systemd.spec index bf5f39b..37e1529 100644 --- a/systemd.spec +++ b/systemd.spec @@ -22,7 +22,7 @@ Url: http://www.freedesktop.org/wiki/Software/systemd # THIS PACKAGE FOR A NON-RAWHIDE DEVELOPMENT DISTRIBUTION! Version: 195 -Release: 1%{?gitcommit:.git%{gitcommit}}%{?dist} +Release: 2%{?gitcommit:.git%{gitcommit}}%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: A System and Service Manager @@ -104,6 +104,7 @@ Obsoletes: systemd < 185-4 Conflicts: systemd < 185-4 Obsoletes: system-setup-keyboard < 0.9 Provides: system-setup-keyboard = 0.9 +Provides: syslog %description systemd is a system and service manager for Linux, compatible with @@ -639,6 +640,9 @@ fi %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Tue Oct 23 2012 Lennart Poettering - 195-2 +- Provide syslog because the journal is fine as a syslog implementation + * Tue Oct 23 2012 Lennart Poettering - 195-1 - New upstream release - https://bugzilla.redhat.com/show_bug.cgi?id=831665 From 0969ad24898347919865e9298fa01e19cec98649 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Wed, 24 Oct 2012 03:31:10 +0200 Subject: [PATCH 16/17] migrate /etc/sysconfig/ i18n, keyboard, network files/variables --- systemd.spec | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/systemd.spec b/systemd.spec index 37e1529..b2f80a3 100644 --- a/systemd.spec +++ b/systemd.spec @@ -22,7 +22,7 @@ Url: http://www.freedesktop.org/wiki/Software/systemd # THIS PACKAGE FOR A NON-RAWHIDE DEVELOPMENT DISTRIBUTION! Version: 195 -Release: 2%{?gitcommit:.git%{gitcommit}}%{?dist} +Release: 3%{?gitcommit:.git%{gitcommit}}%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: A System and Service Manager @@ -377,7 +377,7 @@ else /usr/bin/systemctl enable "$service" >/dev/null 2>&1 || : done < /var/lib/rpm-state/systemd/ntp-units /usr/bin/rm -r /var/lib/rpm-state/systemd/ntp-units - fi + fi fi # Migrate /etc/sysconfig/clock @@ -389,6 +389,37 @@ if [ ! -L /etc/localtime -a -e /etc/sysconfig/clock ] ; then fi /usr/bin/rm -f /etc/sysconfig/clock >/dev/null 2>&1 || : +# Migrate /etc/sysconfig/i18n +if [ -e /etc/sysconfig/i18n -a ! -e /etc/locale.conf ]; then + unset LANG + . /etc/sysconfig/i18n 2>&1 || : + [ -n "$LANG" ] && echo LANG=$LANG > /etc/locale.conf 2>&1 || : +fi + +# Migrate /etc/sysconfig/keyboard +if [ -e /etc/sysconfig/keyboard -a ! -e /etc/vconsole.conf ]; then + unset SYSFONT + unset SYSFONTACM + unset UNIMAP + unset KEYMAP + [ -e /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n 2>&1 || : + . /etc/sysconfig/keyboard 2>&1 || : + [ -n "$SYSFONT" ] && echo FONT=$SYSFONT > /etc/vconsole.conf 2>&1 || : + [ -n "$SYSFONTACM" ] && echo FONT_MAP=$SYSFONTACM >> /etc/vconsole.conf 2>&1 || : + [ -n "$UNIMAP" ] && echo FONT_UNIMAP=$UNIMAP >> /etc/vconsole.conf 2>&1 || : + [ -n "$KEYTABLE" ] && echo KEYMAP=$KEYTABLE >> /etc/vconsole.conf 2>&1 || : +fi +/usr/bin/rm -f /etc/sysconfig/i18n >/dev/null 2>&1 || : +/usr/bin/rm -f /etc/sysconfig/keyboard >/dev/null 2>&1 || : + +# Migrate HOSTNAME= from /etc/sysconfig/network +if [ -e /etc/sysconfig/network -a ! -e /etc/hostname ]; then + unset HOSTNAME + . /etc/sysconfig/network 2>&1 || : + [ -n "$HOSTNAME" ] && echo $HOSTNAME > /etc/hostname 2>&1 || : +fi +/usr/bin/sed -i '/HOSTNAME/d' /etc/sysconfig/network 2>&1 || : + %posttrans # Convert old /etc/sysconfig/desktop settings preferred= @@ -640,6 +671,10 @@ fi %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Wed Oct 24 2012 Kay Sievers - 195-3 +- Migrate /etc/sysconfig/ i18n, keyboard, network files/variables to + systemd native files + * Tue Oct 23 2012 Lennart Poettering - 195-2 - Provide syslog because the journal is fine as a syslog implementation From 3c3608d36e96ab0ecf837c65e15a2fc61f4c1c1a Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Wed, 24 Oct 2012 18:18:40 +0200 Subject: [PATCH 17/17] add dmraid-activation.service to the default preset - add yum protected.d fragment - https://bugzilla.redhat.com/show_bug.cgi?id=869619 - https://bugzilla.redhat.com/show_bug.cgi?id=869717 --- 90-default.preset | 1 + systemd.spec | 15 ++++++++++++++- yum-protect-systemd.conf | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 yum-protect-systemd.conf diff --git a/90-default.preset b/90-default.preset index 8dd812e..7fec5f7 100644 --- a/90-default.preset +++ b/90-default.preset @@ -32,6 +32,7 @@ enable libstoragemgmt.service enable lvm2-monitor.* enable lvm2-lvmetad.* enable dm-event.* +enable dmraid-activation.service # https://bugzilla.redhat.com/show_bug.cgi?id=855372 enable mdmonitor.service diff --git a/systemd.spec b/systemd.spec index b2f80a3..2483a5e 100644 --- a/systemd.spec +++ b/systemd.spec @@ -22,7 +22,7 @@ Url: http://www.freedesktop.org/wiki/Software/systemd # THIS PACKAGE FOR A NON-RAWHIDE DEVELOPMENT DISTRIBUTION! Version: 195 -Release: 3%{?gitcommit:.git%{gitcommit}}%{?dist} +Release: 4%{?gitcommit:.git%{gitcommit}}%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: A System and Service Manager @@ -81,6 +81,8 @@ Source2: systemd-sysv-convert Source3: udlfb.conf # Stop-gap, just to ensure things work fine with rsyslog without having to change the package right-away Source4: listen.conf +# Prevent accidental removal of the systemd package +Source6: yum-protect-systemd.conf Obsoletes: SysVinit < 2.86-24, sysvinit < 2.86-24 Provides: SysVinit = 2.86-24, sysvinit = 2.86-24 @@ -277,6 +279,10 @@ glib-based applications using libudev functionality. /usr/bin/mkdir -p %{buildroot}%{_sysconfdir}/rsyslog.d/ /usr/bin/install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/rsyslog.d/ +# Install yum protection fragment +/usr/bin/mkdir -p %{buildroot}%{_sysconfdir}/yum/protected.d/ +/usr/bin/install -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/yum/protected.d/systemd.conf + # To avoid making life hard for Rawhide-using developers, don't package the # kernel.core_pattern setting until systemd-coredump is a part of an actual # systemd release and it's made clear how to get the core dumps out of the @@ -522,6 +528,7 @@ fi %config(noreplace) %{_sysconfdir}/udev/udev.conf %config(noreplace) %{_sysconfdir}/rsyslog.d/listen.conf %config(noreplace) %{_sysconfdir}/modprobe.d/udlfb.conf +%config(noreplace) %{_sysconfdir}/yum/protected.d/systemd.conf %{_sysconfdir}/bash_completion.d/systemd-bash-completion.sh %{_sysconfdir}/rpm/macros.systemd %{_sysconfdir}/xdg/systemd @@ -671,6 +678,12 @@ fi %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Wed Oct 24 2012 Michal Schmidt - 195-4 +- add dmraid-activation.service to the default preset +- add yum protected.d fragment +- https://bugzilla.redhat.com/show_bug.cgi?id=869619 +- https://bugzilla.redhat.com/show_bug.cgi?id=869717 + * Wed Oct 24 2012 Kay Sievers - 195-3 - Migrate /etc/sysconfig/ i18n, keyboard, network files/variables to systemd native files diff --git a/yum-protect-systemd.conf b/yum-protect-systemd.conf new file mode 100644 index 0000000..24ad079 --- /dev/null +++ b/yum-protect-systemd.conf @@ -0,0 +1 @@ +systemd