From 36c8f2a09115d0d812c5a0b94d24826606c9184caa8c87f17174e7451cbae661 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 19 May 2011 14:40:35 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/sysvinit revision 115.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/sysvinit?expand=0&rev=7c3846f54be2a900b6828cdce2cb6eaf --- sysvinit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysvinit.spec b/sysvinit.spec index 85e5c1b..cd5118d 100644 --- a/sysvinit.spec +++ b/sysvinit.spec @@ -29,7 +29,7 @@ License: GPLv2+ Group: System/Base AutoReqProv: on Version: 2.88+ -Release: 46 +Release: 48 Summary: SysV-Style init BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: audit-devel libselinux-devel libsepol-devel pam-devel From b953e7b9ddeda7f4cfb589a10d2e8edbc2b841936f72f165c56e0f86277dd772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Wed, 1 Jun 2011 15:13:38 +0000 Subject: [PATCH 2/2] Accepting request 72431 from home:lnussel:branches:Base:System - use /run for utmp as that's already mounted by the initrd OBS-URL: https://build.opensuse.org/request/show/72431 OBS-URL: https://build.opensuse.org/package/show/Base:System/sysvinit?expand=0&rev=125 --- sysvinit-2.88+dsf-run.diff | 23 +++++++++++++++++++++++ sysvinit.changes | 5 +++++ sysvinit.spec | 2 ++ 3 files changed, 30 insertions(+) create mode 100644 sysvinit-2.88+dsf-run.diff diff --git a/sysvinit-2.88+dsf-run.diff b/sysvinit-2.88+dsf-run.diff new file mode 100644 index 0000000..3dc4df8 --- /dev/null +++ b/sysvinit-2.88+dsf-run.diff @@ -0,0 +1,23 @@ +use /run/utmp +Index: src/paths.h +=================================================================== +--- src/paths.h.orig ++++ src/paths.h +@@ -48,3 +48,5 @@ + #define REBOOTSCRIPT2 "/etc/rc.d/rc.6" /* Ditto. */ + #endif + ++#undef UTMP_FILE ++#define UTMP_FILE "/run/utmp" +Index: src/init.c +=================================================================== +--- src/init.c.orig ++++ src/init.c +@@ -2634,6 +2634,7 @@ void init_main(void) + */ + if ((fd = open(UTMP_FILE, O_WRONLY|O_CREAT|O_TRUNC, 0644)) >= 0) + close(fd); ++ utmpname(UTMP_FILE); + + /* + * Say hello to the world diff --git a/sysvinit.changes b/sysvinit.changes index 1c90c74..4e8945f 100644 --- a/sysvinit.changes +++ b/sysvinit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 1 12:57:08 UTC 2011 - lnussel@suse.de + +- use /run for utmp as that's already mounted by the initrd + ------------------------------------------------------------------ Thu May 19 12:53:51 CEST 2011 - werner@suse.de diff --git a/sysvinit.spec b/sysvinit.spec index cd5118d..08f797b 100644 --- a/sysvinit.spec +++ b/sysvinit.spec @@ -50,6 +50,7 @@ Patch2: sysvinit-2.88dsf-suse.patch Patch3: sysvinit-2.88dsf-no-kill.patch Patch4: notify-pam-dead.patch Patch5: sysvinit-2.88dsf-multiple-sulogin.patch +Patch6: sysvinit-2.88+dsf-run.diff Patch20: powerd-2.0.2.dif Patch21: powerd-2.0.2-getaddrinfo.patch Patch30: killproc-2.19.dif @@ -91,6 +92,7 @@ sysvinit package. %patch3 -p0 -b .no-kill %patch4 -p0 -b .pam %patch5 -p0 -b .sulogin +%patch6 -p0 -b .run %patch pushd ../powerd-%{PDVER} %patch20