efi-boot-generator patched to use /boot/efi

[packages/systemd.git] / systemd.spec

diff --git a/systemd.spec b/systemd.spec
index c880546b0c9c5e10db853e9fe8f2c62d2506897b..6c2cd1e6c5c1aade039152d527143bf543c34450 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -61,6 +61,7 @@ Patch12:      proc-hidepid.patch
 Patch14:       dont-hash-null-keys.patch
 Patch15:       hibernate-to-file.patch
 Patch16:       systemd-configfs.patch
+Patch17:       pld-boot_efi_mount.patch
 URL:           http://www.freedesktop.org/wiki/Software/systemd
 BuildRequires: acl-devel
 BuildRequires: attr-devel
@@ -594,6 +595,7 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
 #patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 cp -p %{SOURCE2} src/systemd_booted.c
 
 %build
@@ -833,7 +835,6 @@ if [ $1 -eq 1 ]; then
 
        # Enable the services we install by default.
        /bin/systemctl enable \
-               getty@.service \
                network.service \
                remote-fs.target \
                systemd-readahead-replay.service \
@@ -844,7 +845,6 @@ fi
 %preun units
 if [ $1 -eq 0 ] ; then
        /bin/systemctl disable \
-               getty@.service \
                network.service \
                remote-fs.target \
                systemd-readahead-replay.service \
@@ -887,6 +887,12 @@ if [ -f /etc/sysconfig/rpm ]; then
        fi
 fi
 
+%triggerpostun units -- systemd-units < 1:208-9
+# remove buggy symlink
+if [ -L /etc/systemd/system/getty.target.wants/getty@.service ] ; then
+       rm -f /etc/systemd/system/getty.target.wants/getty@.service || :
+fi
+
 %post inetd
 %systemd_reload
 # Do not change it to restart, we only want to start new services here