From 76ed52e16b0c879705c06700b0002f44d6284a173d1167be96846708573809ae Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@suse.com>
Date: Mon, 18 Feb 2013 16:15:49 +0000
Subject: [PATCH] Accepting request 155742 from
 home:jengelh:branches:Base:System

- Create getty@tty1.service to restore traditional SUSE behavior
  of not clearing tty1. (bnc#804158)

OBS-URL: https://build.opensuse.org/request/show/155742
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=350
---
 systemd-mini.changes | 7 +++++++
 systemd-mini.spec    | 9 +++++++--
 systemd.changes      | 7 +++++++
 systemd.spec         | 9 +++++++--
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/systemd-mini.changes b/systemd-mini.changes
index d5bdae3e..dc1b54a3 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Feb 18 09:27:05 UTC 2013 - jengelh@inai.de
+
+- Create getty@tty1.service to restore traditional SUSE behavior
+  of not clearing tty1. (bnc#804158)
+- Better use of find -exec
+
 -------------------------------------------------------------------
 Fri Feb 15 16:04:39 UTC 2013 - fcrozat@suse.com
 
diff --git a/systemd-mini.spec b/systemd-mini.spec
index 791ba417..a1d4a397 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -604,7 +604,7 @@ cp %{SOURCE7} m4/
 %build
 autoreconf -fiv
 # prevent pre-generated and distributed files from re-building
-find . -name "*.[1-8]" -exec touch '{}' \;
+find . -name "*.[1-8]" -exec touch '{}' '+';
 export V=1
 # keep split-usr until all packages have moved their systemd rules to /usr
 %configure \
@@ -656,7 +656,7 @@ ln -sf ../systemd-udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/syste
 chmod 644 %{buildroot}%{_bindir}/systemd-analyze
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 install -m644 %{S:4} %{buildroot}%{_sysconfdir}/rpm
-find %{buildroot} -type f -name '*.la' -exec rm -f {} ';'
+find %{buildroot} -type f -name '*.la' -delete
 mkdir -p %{buildroot}/{sbin,var/lib/systemd/sysv-convert,var/lib/systemd/migrated} %{buildroot}/usr/lib/systemd/{system-generators,user-generators,system-preset,user-preset,system/halt.target.wants,system/kexec.target.wants,system/poweroff.target.wants,system/reboot.target.wants}
 
 install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert
@@ -733,6 +733,11 @@ 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/syslog.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"
+
 %fdupes -s %{buildroot}%{_mandir}
 
 %pre
diff --git a/systemd.changes b/systemd.changes
index d5bdae3e..dc1b54a3 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Feb 18 09:27:05 UTC 2013 - jengelh@inai.de
+
+- Create getty@tty1.service to restore traditional SUSE behavior
+  of not clearing tty1. (bnc#804158)
+- Better use of find -exec
+
 -------------------------------------------------------------------
 Fri Feb 15 16:04:39 UTC 2013 - fcrozat@suse.com
 
diff --git a/systemd.spec b/systemd.spec
index d067c932..88005276 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -599,7 +599,7 @@ cp %{SOURCE7} m4/
 %build
 autoreconf -fiv
 # prevent pre-generated and distributed files from re-building
-find . -name "*.[1-8]" -exec touch '{}' \;
+find . -name "*.[1-8]" -exec touch '{}' '+';
 export V=1
 # keep split-usr until all packages have moved their systemd rules to /usr
 %configure \
@@ -651,7 +651,7 @@ ln -sf ../systemd-udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/syste
 chmod 644 %{buildroot}%{_bindir}/systemd-analyze
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 install -m644 %{S:4} %{buildroot}%{_sysconfdir}/rpm
-find %{buildroot} -type f -name '*.la' -exec rm -f {} ';'
+find %{buildroot} -type f -name '*.la' -delete
 mkdir -p %{buildroot}/{sbin,var/lib/systemd/sysv-convert,var/lib/systemd/migrated} %{buildroot}/usr/lib/systemd/{system-generators,user-generators,system-preset,user-preset,system/halt.target.wants,system/kexec.target.wants,system/poweroff.target.wants,system/reboot.target.wants}
 
 install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert
@@ -728,6 +728,11 @@ 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/syslog.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"
+
 %fdupes -s %{buildroot}%{_mandir}
 
 %pre