diff --git a/Add-bootsplash-handling-for-password-dialogs.patch b/Add-bootsplash-handling-for-password-dialogs.patch deleted file mode 100644 index bf97901b..00000000 --- a/Add-bootsplash-handling-for-password-dialogs.patch +++ /dev/null @@ -1,57 +0,0 @@ -From: Stefan Seyfried -Date: Thu, 16 Dec 2010 11:30:17 +0100 -Subject: Add bootsplash handling for password dialogs - -openSUSE uses bootsplash.org, so add a crude handling for setting the -splash screen to verbose when a password is asked... ---- - src/shared/ask-password-api.c | 22 ++++++++++++++++++++++ - 1 file changed, 22 insertions(+) - -diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c -index 4557155..3750f64 100644 ---- a/src/shared/ask-password-api.c -+++ b/src/shared/ask-password-api.c -@@ -63,6 +63,9 @@ int ask_password_tty( - bool reset_tty = false; - bool silent_mode = false; - bool dirty = false; -+ bool splash_silent = false; -+ FILE *procsplash = NULL; -+ char *line = NULL; - enum { - POLL_TTY, - POLL_INOTIFY -@@ -106,6 +109,19 @@ int ask_password_tty( - } - - reset_tty = true; -+ procsplash = fopen("/proc/splash", "r+"); -+ if (procsplash) { -+ getline(&line, &p, procsplash); -+ p = 0; /* reset, just to make sure */ -+ if (line && -+ (strstr(line, "on\n") == line + strlen(line) - 3) && -+ (strstr(line, "silent") != NULL)) { -+ splash_silent = true; -+ rewind(procsplash); -+ fprintf(procsplash, "verbose\n"); -+ fflush(procsplash); -+ } -+ } - } - - zero(pollfd); -@@ -239,6 +255,12 @@ finish: - close_nointr_nofail(ttyfd); - } - -+ if (splash_silent) { /* only set if procsplash != NULL */ -+ rewind(procsplash); -+ fprintf(procsplash, "silent\n"); -+ fclose(procsplash); -+ } -+ - return r; - } - diff --git a/Revert-service-drop-support-for-SysV-scripts-for-the-early.patch b/Revert-service-drop-support-for-SysV-scripts-for-the-early.patch index 2432288a..eeb004a2 100644 --- a/Revert-service-drop-support-for-SysV-scripts-for-the-early.patch +++ b/Revert-service-drop-support-for-SysV-scripts-for-the-early.patch @@ -28,7 +28,7 @@ index c13ff35..0b39ec6 100644 { "rc4.d", SPECIAL_RUNLEVEL4_TARGET, RUNLEVEL_UP }, { "rc5.d", SPECIAL_RUNLEVEL5_TARGET, RUNLEVEL_UP }, -+#ifdef TARGET_SUSE ++#ifdef HAVE_SYSV_COMPAT + /* SUSE style boot.d */ + { "boot.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT }, +#endif diff --git a/ensure-systemd-udevd-is-started-before-local-fs-pre-for-lo.patch b/ensure-systemd-udevd-is-started-before-local-fs-pre-for-lo.patch deleted file mode 100644 index 795980bd..00000000 --- a/ensure-systemd-udevd-is-started-before-local-fs-pre-for-lo.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Frederic Crozat -Date: Mon, 8 Apr 2013 14:51:47 +0200 -Subject: ensure systemd-udevd is started before local-fs-pre for loopback - mount - -ensure udevd is started (and therefore static devices are created) -before mounting (bnc#809820). ---- - units/local-fs-pre.target | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/units/local-fs-pre.target b/units/local-fs-pre.target -index 05fcbd4..7f13907 100644 ---- a/units/local-fs-pre.target -+++ b/units/local-fs-pre.target -@@ -9,4 +9,4 @@ - Description=Local File Systems (Pre) - Documentation=man:systemd.special(7) - RefuseManualStart=yes --After=md.service lvm.service dmraid.service -+After=md.service lvm.service dmraid.service systemd-udevd.service diff --git a/systemd-mini.changes b/systemd-mini.changes index cb74ecbc..9d5e6d73 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue May 28 03:24:39 UTC 2013 - crrodriguez@opensuse.org + +- Drop Add-bootsplash-handling-for-password-dialogs.patch bootsplash +support has been removed from the kernel. +- Drop ensure-systemd-udevd-is-started-before-local-fs-pre-for-lo.patch +fixed in systemd v199, commit 89d09e1b5c65a2d97840f682e0932c8bb499f166 +- Apply rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch +only on ARM, patch rejected upstream because is too generic. +- no such define TARGET_SUSE exists but it is used in +Revert-service-drop-support-for-SysV-scripts-for-the-early.patch +use HAVE_SYSV_COMPAT instead. + ------------------------------------------------------------------- Fri May 24 11:37:49 UTC 2013 - fcrozat@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 628686af..92bf3ba5 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -118,7 +118,6 @@ Source1062: systemd-udev-root-symlink Patch0: avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch # PATCH-FIX-UPSTREAM optionally-warn-if-nss-myhostname-is-called.patch lnussel@suse.com -- optionally warn if nss-myhostname is called Patch1: optionally-warn-if-nss-myhostname-is-called.patch -Patch2: Add-bootsplash-handling-for-password-dialogs.patch # handle SUSE specific kbd settings Patch3: handle-disable_caplock-and-compose_table-and-kbd_rate.patch Patch4: handle-numlock-value-in-etc-sysconfig-keyboard.patch @@ -146,8 +145,6 @@ Patch20: handle-root_uses_lang-value-in-etc-sysconfig-language.patch Patch21: allow-multiple-sulogin-to-be-started.patch # PATCH-FIX-OPENSUSE handle-SYSTEMCTL_OPTIONS-environment-variable.patch bnc#798620 fcrozat@suse.com -- handle SYSTEMCTL_OPTIONS environment variable Patch22: handle-SYSTEMCTL_OPTIONS-environment-variable.patch -# PATCH-FIX-UPSTREAM ensure-systemd-udevd-is-started-before-local-fs-pre-for-lo.patch bnc#809820 fcrozat@suse.com -- loopback mount should be started after /dev/loop-control is available -Patch26: ensure-systemd-udevd-is-started-before-local-fs-pre-for-lo.patch # PATCH-FIX-OPENSUSE apply-ACL-for-nvidia-device-nodes.patch bnc#808319 -- set ACL on nvidia devices Patch27: apply-ACL-for-nvidia-device-nodes.patch # PATCH-FIX-OPENSUSE Revert-service-drop-support-for-SysV-scripts-for-the-early.patch fcrozat@suse.com -- handle boot.* initscripts @@ -372,7 +369,6 @@ cp %{SOURCE7} m4/ #systemd %patch0 -p1 %patch1 -p1 -%patch2 -p1 %patch3 -p1 # don't apply when bootstrapping to not modify configure.in %if ! 0%{?bootstrap} @@ -399,10 +395,11 @@ cp %{SOURCE7} m4/ %patch23 -p1 %patch24 -p1 %patch25 -p1 -%patch26 -p1 %patch27 -p1 %patch37 -p1 +%ifarch %arm %patch38 -p1 +%endif %patch39 -p1 %patch40 -p1 %patch41 -p1 diff --git a/systemd.changes b/systemd.changes index cb74ecbc..9d5e6d73 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue May 28 03:24:39 UTC 2013 - crrodriguez@opensuse.org + +- Drop Add-bootsplash-handling-for-password-dialogs.patch bootsplash +support has been removed from the kernel. +- Drop ensure-systemd-udevd-is-started-before-local-fs-pre-for-lo.patch +fixed in systemd v199, commit 89d09e1b5c65a2d97840f682e0932c8bb499f166 +- Apply rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch +only on ARM, patch rejected upstream because is too generic. +- no such define TARGET_SUSE exists but it is used in +Revert-service-drop-support-for-SysV-scripts-for-the-early.patch +use HAVE_SYSV_COMPAT instead. + ------------------------------------------------------------------- Fri May 24 11:37:49 UTC 2013 - fcrozat@suse.com diff --git a/systemd.spec b/systemd.spec index 65273b41..55910a07 100644 --- a/systemd.spec +++ b/systemd.spec @@ -113,7 +113,6 @@ Source1062: systemd-udev-root-symlink Patch0: avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch # PATCH-FIX-UPSTREAM optionally-warn-if-nss-myhostname-is-called.patch lnussel@suse.com -- optionally warn if nss-myhostname is called Patch1: optionally-warn-if-nss-myhostname-is-called.patch -Patch2: Add-bootsplash-handling-for-password-dialogs.patch # handle SUSE specific kbd settings Patch3: handle-disable_caplock-and-compose_table-and-kbd_rate.patch Patch4: handle-numlock-value-in-etc-sysconfig-keyboard.patch @@ -141,8 +140,6 @@ Patch20: handle-root_uses_lang-value-in-etc-sysconfig-language.patch Patch21: allow-multiple-sulogin-to-be-started.patch # PATCH-FIX-OPENSUSE handle-SYSTEMCTL_OPTIONS-environment-variable.patch bnc#798620 fcrozat@suse.com -- handle SYSTEMCTL_OPTIONS environment variable Patch22: handle-SYSTEMCTL_OPTIONS-environment-variable.patch -# PATCH-FIX-UPSTREAM ensure-systemd-udevd-is-started-before-local-fs-pre-for-lo.patch bnc#809820 fcrozat@suse.com -- loopback mount should be started after /dev/loop-control is available -Patch26: ensure-systemd-udevd-is-started-before-local-fs-pre-for-lo.patch # PATCH-FIX-OPENSUSE apply-ACL-for-nvidia-device-nodes.patch bnc#808319 -- set ACL on nvidia devices Patch27: apply-ACL-for-nvidia-device-nodes.patch # PATCH-FIX-OPENSUSE Revert-service-drop-support-for-SysV-scripts-for-the-early.patch fcrozat@suse.com -- handle boot.* initscripts @@ -367,7 +364,6 @@ cp %{SOURCE7} m4/ #systemd %patch0 -p1 %patch1 -p1 -%patch2 -p1 %patch3 -p1 # don't apply when bootstrapping to not modify configure.in %if ! 0%{?bootstrap} @@ -394,10 +390,11 @@ cp %{SOURCE7} m4/ %patch23 -p1 %patch24 -p1 %patch25 -p1 -%patch26 -p1 %patch27 -p1 %patch37 -p1 +%ifarch %arm %patch38 -p1 +%endif %patch39 -p1 %patch40 -p1 %patch41 -p1