rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

Accepting request 173023 from home:fcrozat:branches:Base:System

Browse Source 
- Use drop-in file to fix bnc#804158.

OBS-URL: https://build.opensuse.org/request/show/173023
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=370
This commit is contained in:
Dr. Werner Fink 2013-04-25 07:23:12 +00:00 committed by Git OBS Bridge
parent 16bae67520
commit ff82543c6f
4 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
systemd-mini.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
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 Tue Apr 23 12:44:16 UTC 2013 - coolo@suse.com

13
systemd-mini.spec
View File

@ -554,10 +554,13 @@ mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-sleep/
mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/default.target.wants mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/default.target.wants
mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/dbus.target.wants mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/dbus.target.wants
src="%buildroot/%_libexecdir/systemd/system/getty@.service" # create drop-in to prevent tty1 to be cleared (bnc#804158)
dst="${src/@/@tty1}" mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/getty@tty1.service.d/
cp "$src" "$dst" echo << EOF > %{buildroot}%{_prefix}/lib/systemd/system/getty@tty1.service.d/noclear.conf
perl -i -pe 's{^# the VT is cleared.*}{}i;s{(^TTYVTDisallocate=.*)}{}' "$dst" [Service]
# ensure tty1 isn't cleared (bnc#804158)
TTYVTDisallocate=no
EOF
%fdupes -s %{buildroot}%{_mandir} %fdupes -s %{buildroot}%{_mandir}
@ -792,6 +795,8 @@ fi
%dir %{_prefix}/lib/systemd/system-sleep/ %dir %{_prefix}/lib/systemd/system-sleep/
%dir %{_prefix}/lib/systemd/system/default.target.wants %dir %{_prefix}/lib/systemd/system/default.target.wants
%dir %{_prefix}/lib/systemd/system/dbus.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} %if ! 0%{?bootstrap}
%{_prefix}/lib/systemd/system-generators/systemd-cryptsetup-generator %{_prefix}/lib/systemd/system-generators/systemd-cryptsetup-generator
%endif %endif

5
systemd.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
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 Tue Apr 23 12:44:16 UTC 2013 - coolo@suse.com

13
systemd.spec
View File

@ -549,10 +549,13 @@ mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-sleep/
mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/default.target.wants mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/default.target.wants
mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/dbus.target.wants mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/dbus.target.wants
src="%buildroot/%_libexecdir/systemd/system/getty@.service" # create drop-in to prevent tty1 to be cleared (bnc#804158)
dst="${src/@/@tty1}" mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/getty@tty1.service.d/
cp "$src" "$dst" echo << EOF > %{buildroot}%{_prefix}/lib/systemd/system/getty@tty1.service.d/noclear.conf
perl -i -pe 's{^# the VT is cleared.*}{}i;s{(^TTYVTDisallocate=.*)}{}' "$dst" [Service]
# ensure tty1 isn't cleared (bnc#804158)
TTYVTDisallocate=no
EOF
%fdupes -s %{buildroot}%{_mandir} %fdupes -s %{buildroot}%{_mandir}
@ -787,6 +790,8 @@ fi
%dir %{_prefix}/lib/systemd/system-sleep/ %dir %{_prefix}/lib/systemd/system-sleep/
%dir %{_prefix}/lib/systemd/system/default.target.wants %dir %{_prefix}/lib/systemd/system/default.target.wants
%dir %{_prefix}/lib/systemd/system/dbus.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} %if ! 0%{?bootstrap}
%{_prefix}/lib/systemd/system-generators/systemd-cryptsetup-generator %{_prefix}/lib/systemd/system-generators/systemd-cryptsetup-generator
%endif %endif