Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2013-04-26 19:21:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systemd", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2013-04-23 11:39:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes 2013-04-26 19:22:00.000000000 +0200 @@ -1,0 +2,27 @@ +Fri Apr 26 16:37:28 CEST 2013 - fcrozat@suse.com + +- Fix handle-etc-HOSTNAME.patch to properly set hostname at startup + when using /etc/HOSTNAME. + +------------------------------------------------------------------- +Thu Apr 25 08:19:30 UTC 2013 - rmilasan@suse.com + +- Rename remaning udev patches (clean-up). +- Generate %{_libexecdir}/modules-load.d/sg.conf so we load sg module at + boot time not from udev (bnc#761109). +- Drop unused patches: + 1001-Reinstate-TIMEOUT-handling.patch + 1005-udev-fix-sg-autoload-regression.patch + 1026-re-add-persistent-net.patch + +------------------------------------------------------------------- +Tue Apr 23 14:58:47 CEST 2013 - fcrozat@suse.com + +- Use drop-in file to fix bnc#804158. + +------------------------------------------------------------------- +Tue Apr 23 12:44:16 UTC 2013 - coolo@suse.com + +- add some more conflicts to make bootstrap work + +------------------------------------------------------------------- systemd.changes: same change Old: ---- 1001-Reinstate-TIMEOUT-handling.patch 1002-re-enable-by_path-links-for-ata-devices.patch 1003-rules-create-by-id-scsi-links-for-ATA-devices.patch 1004-udev-netlink-null-rules.patch 1005-udev-fix-sg-autoload-regression.patch 1007-fix-devname-prefix.patch 1021-create-default-links-for-primary-cd_dvd-drive.patch 1026-re-add-persistent-net.patch 1027-udev-always-rename-network.patch New: ---- 1001-re-enable-by_path-links-for-ata-devices.patch 1002-rules-create-by-id-scsi-links-for-ATA-devices.patch 1003-udev-netlink-null-rules.patch 1004-fix-devname-prefix.patch 1005-create-default-links-for-primary-cd_dvd-drive.patch 1006-udev-always-rename-network.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.yHWFn4/_old 2013-04-26 19:22:03.000000000 +0200 +++ /var/tmp/diff_new_pack.yHWFn4/_new 2013-04-26 19:22:03.000000000 +0200 @@ -81,6 +81,7 @@ %if 0%{?bootstrap} Requires: this-is-only-for-build-envs Conflicts: systemd +Conflicts: kiwi %else # the buildignore is important for bootstrapping #!BuildIgnore: udev @@ -169,24 +170,18 @@ Patch38: rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch # udev patches -# PATCH-FIX-OPENSUSE 1001-Reinstate-TIMEOUT-handling.patch -Patch1001: 1001-Reinstate-TIMEOUT-handling.patch -# PATCH-FIX-OPENSUSE 1002-re-enable-by_path-links-for-ata-devices.patch -Patch1002: 1002-re-enable-by_path-links-for-ata-devices.patch -# PATCH-FIX-OPENSUSE 1003-rules-create-by-id-scsi-links-for-ATA-devices.patch -Patch1003: 1003-rules-create-by-id-scsi-links-for-ATA-devices.patch -# PATCH-FIX-OPENSUSE 1004-udev-netlink-null-rules.patch -Patch1004: 1004-udev-netlink-null-rules.patch -# PATCH-FIX-OPENSUSE 1005-udev-fix-sg-autoload-regression.patch -Patch1005: 1005-udev-fix-sg-autoload-regression.patch -# PATCH-FIX-OPENSUSE 1007-fix-devname-prefix.patch fcrozat@suse.com -- fix modules.devname path, it isn't in /usr -Patch1007: 1007-fix-devname-prefix.patch -# PATCH-FIX-OPENSUSE 1021-create-default-links-for-primary-cd_dvd-drive.patch -Patch1021: 1021-create-default-links-for-primary-cd_dvd-drive.patch -# PATCH-FIX-OPENSUSE 1026-re-add-persistent-net.patch -Patch1026: 1026-re-add-persistent-net.patch -# PATCH-FIX-OPENSUSE 1027-udev-always-rename-network.patch -Patch1027: 1027-udev-always-rename-network.patch +# PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch +Patch1001: 1001-re-enable-by_path-links-for-ata-devices.patch +# PATCH-FIX-OPENSUSE 1002-rules-create-by-id-scsi-links-for-ATA-devices.patch +Patch1002: 1002-rules-create-by-id-scsi-links-for-ATA-devices.patch +# PATCH-FIX-OPENSUSE 1003-udev-netlink-null-rules.patch +Patch1003: 1003-udev-netlink-null-rules.patch +# PATCH-FIX-OPENSUSE 1004-fix-devname-prefix.patch fcrozat@suse.com -- fix modules.devname path, it isn't in /usr +Patch1004: 1004-fix-devname-prefix.patch +# PATCH-FIX-OPENSUSE 1005-create-default-links-for-primary-cd_dvd-drive.patch +Patch1005: 1005-create-default-links-for-primary-cd_dvd-drive.patch +# PATCH-FIX-OPENSUSE 1006-udev-always-rename-network.patch +Patch1006: 1006-udev-always-rename-network.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -205,6 +200,9 @@ License: LGPL-2.1+ Group: Development/Libraries/C and C++ Requires: %{name} = %{version} +%if 0%{?bootstrap} +Conflicts: systemd-devel +%endif %description devel Development headers and auxiliary files for developing applications for systemd. @@ -237,7 +235,7 @@ Requires: filesystem %if 0%{?bootstrap} Provides: udev = %{version} -Conflicts: libudev%{udev_major} = %{version} +Conflicts: libudev%{udev_major} Conflicts: udev %endif @@ -257,6 +255,7 @@ Requires: %{udevpkgname} >= %{version}-%{release} %if 0%{?bootstrap} Conflicts: libudev%{udev_major} +Conflicts: kiwi %endif %description -n lib%{udevpkgname}%{udev_major} @@ -365,10 +364,7 @@ %patch1003 -p1 %patch1004 -p1 %patch1005 -p1 -%patch1007 -p1 -%patch1021 -p1 -%patch1026 -p1 -%patch1027 -p1 +%patch1006 -p1 #systemd %patch0 -p1 @@ -507,6 +503,13 @@ # don't mount /tmp as tmpfs for now rm %{buildroot}/%{_prefix}/lib/systemd/system/local-fs.target.wants/tmp.mount +# create %{_libexecdir}/modules-load.d +mkdir -p %{buildroot}%{_libexecdir}/modules-load.d +cat << EOF > %{buildroot}%{_libexecdir}/modules-load.d/sg.conf +# load sg module at boot time +sg +EOF + # To avoid making life hard for Factory 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 @@ -549,10 +552,13 @@ mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/default.target.wants mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/dbus.target.wants -src="%buildroot/%_libexecdir/systemd/system/getty@.service" -dst="${src/@/@tty1}" -cp "$src" "$dst" -perl -i -pe 's{^# the VT is cleared.*}{}i;s{(^TTYVTDisallocate=.*)}{}' "$dst" +# create drop-in to prevent tty1 to be cleared (bnc#804158) +mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/getty@tty1.service.d/ +echo << EOF > %{buildroot}%{_prefix}/lib/systemd/system/getty@tty1.service.d/noclear.conf +[Service] +# ensure tty1 isn't cleared (bnc#804158) +TTYVTDisallocate=no +EOF %fdupes -s %{buildroot}%{_mandir} @@ -716,7 +722,7 @@ %endif %clean -# rm -rf %{buildroot} +rm -rf %{buildroot} %files %defattr(-,root,root) @@ -787,6 +793,8 @@ %dir %{_prefix}/lib/systemd/system-sleep/ %dir %{_prefix}/lib/systemd/system/default.target.wants %dir %{_prefix}/lib/systemd/system/dbus.target.wants +%dir %{_prefix}/lib/systemd/system/getty@tty1.service.d +%{_prefix}/lib/systemd/system/getty@tty1.service.d/noclear.conf %if ! 0%{?bootstrap} %{_prefix}/lib/systemd/system-generators/systemd-cryptsetup-generator %endif @@ -799,6 +807,7 @@ %dir %{_libexecdir}/modules-load.d %dir %{_sysconfdir}/modules-load.d +%{_libexecdir}/modules-load.d/sg.conf %dir %{_libexecdir}/tmpfiles.d %dir %{_sysconfdir}/tmpfiles.d @@ -942,8 +951,6 @@ %{_prefix}/lib/udev/scsi_id %{_prefix}/lib/udev/v4l_id %{_prefix}/lib/udev/write_dev_root_rule -%{_prefix}/lib/udev/write_net_rules -%{_prefix}/lib/udev/rule_generator.functions %dir %{_prefix}/lib/udev/keymaps %{_prefix}/lib/udev/keymaps/* %{_prefix}/lib/udev/keyboard-force-release.sh ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.yHWFn4/_old 2013-04-26 19:22:03.000000000 +0200 +++ /var/tmp/diff_new_pack.yHWFn4/_new 2013-04-26 19:22:03.000000000 +0200 @@ -76,6 +76,7 @@ %if 0%{?bootstrap} Requires: this-is-only-for-build-envs Conflicts: systemd +Conflicts: kiwi %else # the buildignore is important for bootstrapping #!BuildIgnore: udev @@ -164,24 +165,18 @@ Patch38: rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch # udev patches -# PATCH-FIX-OPENSUSE 1001-Reinstate-TIMEOUT-handling.patch -Patch1001: 1001-Reinstate-TIMEOUT-handling.patch -# PATCH-FIX-OPENSUSE 1002-re-enable-by_path-links-for-ata-devices.patch -Patch1002: 1002-re-enable-by_path-links-for-ata-devices.patch -# PATCH-FIX-OPENSUSE 1003-rules-create-by-id-scsi-links-for-ATA-devices.patch -Patch1003: 1003-rules-create-by-id-scsi-links-for-ATA-devices.patch -# PATCH-FIX-OPENSUSE 1004-udev-netlink-null-rules.patch -Patch1004: 1004-udev-netlink-null-rules.patch -# PATCH-FIX-OPENSUSE 1005-udev-fix-sg-autoload-regression.patch -Patch1005: 1005-udev-fix-sg-autoload-regression.patch -# PATCH-FIX-OPENSUSE 1007-fix-devname-prefix.patch fcrozat@suse.com -- fix modules.devname path, it isn't in /usr -Patch1007: 1007-fix-devname-prefix.patch -# PATCH-FIX-OPENSUSE 1021-create-default-links-for-primary-cd_dvd-drive.patch -Patch1021: 1021-create-default-links-for-primary-cd_dvd-drive.patch -# PATCH-FIX-OPENSUSE 1026-re-add-persistent-net.patch -Patch1026: 1026-re-add-persistent-net.patch -# PATCH-FIX-OPENSUSE 1027-udev-always-rename-network.patch -Patch1027: 1027-udev-always-rename-network.patch +# PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch +Patch1001: 1001-re-enable-by_path-links-for-ata-devices.patch +# PATCH-FIX-OPENSUSE 1002-rules-create-by-id-scsi-links-for-ATA-devices.patch +Patch1002: 1002-rules-create-by-id-scsi-links-for-ATA-devices.patch +# PATCH-FIX-OPENSUSE 1003-udev-netlink-null-rules.patch +Patch1003: 1003-udev-netlink-null-rules.patch +# PATCH-FIX-OPENSUSE 1004-fix-devname-prefix.patch fcrozat@suse.com -- fix modules.devname path, it isn't in /usr +Patch1004: 1004-fix-devname-prefix.patch +# PATCH-FIX-OPENSUSE 1005-create-default-links-for-primary-cd_dvd-drive.patch +Patch1005: 1005-create-default-links-for-primary-cd_dvd-drive.patch +# PATCH-FIX-OPENSUSE 1006-udev-always-rename-network.patch +Patch1006: 1006-udev-always-rename-network.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -200,6 +195,9 @@ License: LGPL-2.1+ Group: Development/Libraries/C and C++ Requires: %{name} = %{version} +%if 0%{?bootstrap} +Conflicts: systemd-devel +%endif %description devel Development headers and auxiliary files for developing applications for systemd. @@ -232,7 +230,7 @@ Requires: filesystem %if 0%{?bootstrap} Provides: udev = %{version} -Conflicts: libudev%{udev_major} = %{version} +Conflicts: libudev%{udev_major} Conflicts: udev %endif @@ -252,6 +250,7 @@ Requires: %{udevpkgname} >= %{version}-%{release} %if 0%{?bootstrap} Conflicts: libudev%{udev_major} +Conflicts: kiwi %endif %description -n lib%{udevpkgname}%{udev_major} @@ -360,10 +359,7 @@ %patch1003 -p1 %patch1004 -p1 %patch1005 -p1 -%patch1007 -p1 -%patch1021 -p1 -%patch1026 -p1 -%patch1027 -p1 +%patch1006 -p1 #systemd %patch0 -p1 @@ -502,6 +498,13 @@ # don't mount /tmp as tmpfs for now rm %{buildroot}/%{_prefix}/lib/systemd/system/local-fs.target.wants/tmp.mount +# create %{_libexecdir}/modules-load.d +mkdir -p %{buildroot}%{_libexecdir}/modules-load.d +cat << EOF > %{buildroot}%{_libexecdir}/modules-load.d/sg.conf +# load sg module at boot time +sg +EOF + # To avoid making life hard for Factory 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 @@ -544,10 +547,13 @@ mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/default.target.wants mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/dbus.target.wants -src="%buildroot/%_libexecdir/systemd/system/getty@.service" -dst="${src/@/@tty1}" -cp "$src" "$dst" -perl -i -pe 's{^# the VT is cleared.*}{}i;s{(^TTYVTDisallocate=.*)}{}' "$dst" +# create drop-in to prevent tty1 to be cleared (bnc#804158) +mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/getty@tty1.service.d/ +echo << EOF > %{buildroot}%{_prefix}/lib/systemd/system/getty@tty1.service.d/noclear.conf +[Service] +# ensure tty1 isn't cleared (bnc#804158) +TTYVTDisallocate=no +EOF %fdupes -s %{buildroot}%{_mandir} @@ -711,7 +717,7 @@ %endif %clean -# rm -rf %{buildroot} +rm -rf %{buildroot} %files %defattr(-,root,root) @@ -782,6 +788,8 @@ %dir %{_prefix}/lib/systemd/system-sleep/ %dir %{_prefix}/lib/systemd/system/default.target.wants %dir %{_prefix}/lib/systemd/system/dbus.target.wants +%dir %{_prefix}/lib/systemd/system/getty@tty1.service.d +%{_prefix}/lib/systemd/system/getty@tty1.service.d/noclear.conf %if ! 0%{?bootstrap} %{_prefix}/lib/systemd/system-generators/systemd-cryptsetup-generator %endif @@ -794,6 +802,7 @@ %dir %{_libexecdir}/modules-load.d %dir %{_sysconfdir}/modules-load.d +%{_libexecdir}/modules-load.d/sg.conf %dir %{_libexecdir}/tmpfiles.d %dir %{_sysconfdir}/tmpfiles.d @@ -937,8 +946,6 @@ %{_prefix}/lib/udev/scsi_id %{_prefix}/lib/udev/v4l_id %{_prefix}/lib/udev/write_dev_root_rule -%{_prefix}/lib/udev/write_net_rules -%{_prefix}/lib/udev/rule_generator.functions %dir %{_prefix}/lib/udev/keymaps %{_prefix}/lib/udev/keymaps/* %{_prefix}/lib/udev/keyboard-force-release.sh ++++++ 1002-re-enable-by_path-links-for-ata-devices.patch -> 1001-re-enable-by_path-links-for-ata-devices.patch ++++++ ++++++ 1003-rules-create-by-id-scsi-links-for-ATA-devices.patch -> 1002-rules-create-by-id-scsi-links-for-ATA-devices.patch ++++++ ++++++ 1004-udev-netlink-null-rules.patch -> 1003-udev-netlink-null-rules.patch ++++++ --- /work/SRC/openSUSE:Factory/systemd/1004-udev-netlink-null-rules.patch 2013-04-23 11:39:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new/1003-udev-netlink-null-rules.patch 2013-04-26 19:22:00.000000000 +0200 @@ -7,11 +7,11 @@ src/udev/udevd.c | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/src/udev/udevd.c b/src/udev/udevd.c -index 9be1931..d0c4c72 100644 ---- a/src/udev/udevd.c -+++ b/src/udev/udevd.c -@@ -1414,6 +1414,8 @@ int main(int argc, char *argv[]) +Index: systemd-202/src/udev/udevd.c +=================================================================== +--- systemd-202.orig/src/udev/udevd.c ++++ systemd-202/src/udev/udevd.c +@@ -1407,6 +1407,8 @@ int main(int argc, char *argv[]) dev = udev_monitor_receive_device(monitor); if (dev != NULL) { udev_device_set_usec_initialized(dev, now(CLOCK_MONOTONIC)); ++++++ 1007-fix-devname-prefix.patch -> 1004-fix-devname-prefix.patch ++++++ --- /work/SRC/openSUSE:Factory/systemd/1007-fix-devname-prefix.patch 2013-04-23 11:39:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new/1004-fix-devname-prefix.patch 2013-04-26 19:22:00.000000000 +0200 @@ -7,11 +7,11 @@ src/udev/udevd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/udev/udevd.c b/src/udev/udevd.c -index d0c4c72..599cd3b 100644 ---- a/src/udev/udevd.c -+++ b/src/udev/udevd.c -@@ -831,7 +831,7 @@ static void static_dev_create_from_modules(struct udev *udev) +Index: systemd-202/src/udev/udevd.c +=================================================================== +--- systemd-202.orig/src/udev/udevd.c ++++ systemd-202/src/udev/udevd.c +@@ -824,7 +824,7 @@ static void static_dev_create_from_modul return; } ++++++ 1021-create-default-links-for-primary-cd_dvd-drive.patch -> 1005-create-default-links-for-primary-cd_dvd-drive.patch ++++++ ++++++ 1027-udev-always-rename-network.patch -> 1006-udev-always-rename-network.patch ++++++ ++++++ handle-etc-HOSTNAME.patch ++++++ --- /var/tmp/diff_new_pack.yHWFn4/_old 2013-04-26 19:22:03.000000000 +0200 +++ /var/tmp/diff_new_pack.yHWFn4/_new 2013-04-26 19:22:03.000000000 +0200 @@ -4,9 +4,44 @@ (bnc#803653) --- - src/hostname/hostnamed.c | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) + src/core/hostname-setup.c | 22 +++++++++++++++++----- + src/hostname/hostnamed.c | 12 +++++++++++- + 2 files changed, 28 insertions(+), 6 deletions(-) +diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c +index ac508af..15d206c 100644 +--- a/src/core/hostname-setup.c ++++ b/src/core/hostname-setup.c +@@ -61,12 +61,24 @@ int hostname_setup(void) { + + r = read_and_strip_hostname("/etc/hostname", &b); + if (r < 0) { +- if (r == -ENOENT) +- enoent = true; +- else ++ if (r == -ENOENT) { ++ /* use SUSE fallback */ ++ r = read_and_strip_hostname("/etc/HOSTNAME", &b); ++ if (r < 0) { ++ if (r == -ENOENT) ++ enoent = true; ++ else ++ log_warning("Failed to read configured hostname: %s", strerror(-r)); ++ hn = NULL; ++ } ++ else ++ hn = b; ++ ++ } ++ else { + log_warning("Failed to read configured hostname: %s", strerror(-r)); +- +- hn = NULL; ++ hn = NULL; ++ } + } else + hn = b; + diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c index c7f454c..cfbd706 100644 --- a/src/hostname/hostnamed.c -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org