forked from pool/systemd
.
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=672
This commit is contained in:
Dr. Werner Fink
Git OBS Bridge
parent
3149ce7fc0
commit
46fd2ec51b
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 12 09:40:54 UTC 2014 - werner@suse.de
|
||||
|
||||
- Add workaround for bnc#882393 by adding the systemd update utmp
|
||||
runlevel service to the wanted unit of e.g. the graphical target
|
||||
- Add some later on created files to our file list
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 12 03:33:01 UTC 2014 - jlee@suse.com
|
||||
|
||||
- Generate %{_libexecdir}/modules-load.d/efivars.conf so we load efivars
|
||||
module at boot time not from udev (bnc#881559).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 11 21:59:29 UTC 2014 - crrodriguez@opensuse.org
|
||||
|
||||
|
||||
@ -1316,6 +1316,12 @@ cat << EOF > %{buildroot}%{_libexecdir}/modules-load.d/sg.conf
|
||||
# load sg module at boot time
|
||||
sg
|
||||
EOF
|
||||
%if 0%{has_efi}
|
||||
cat << EOF > %{buildroot}%{_libexecdir}/modules-load.d/efivars.conf
|
||||
# load efivars module at boot time
|
||||
efivars
|
||||
EOF
|
||||
%endif
|
||||
|
||||
# To avoid making life hard for Factory developers, don't package the
|
||||
# kernel.core_pattern setting until systemd-coredump is a part of an actual
|
||||
@ -1440,6 +1446,26 @@ cat > %{buildroot}/%{_prefix}/lib/systemd/system/fix.service <<-'EOF'
|
||||
ln -sf ../fix.service %{buildroot}/%{_prefix}/lib/systemd/system/remote-fs.target.wants
|
||||
%endif
|
||||
|
||||
# Some files which may created by us or by the admin later on
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
|
||||
for ghost in X11/xorg.conf.d/00-keyboard.conf vconsole.conf locale.conf \
|
||||
machine-id machine-info hostname \
|
||||
systemd/system/runlevel2.target \
|
||||
systemd/system/runlevel3.target \
|
||||
systemd/system/runlevel4.target \
|
||||
systemd/system/runlevel4.target \
|
||||
systemd/system/runlevel5.target
|
||||
do
|
||||
> %{buildroot}%{_sysconfdir}/$ghost
|
||||
done
|
||||
|
||||
# Workaround for bug #882393
|
||||
for runlevel in poweroff rescue multi-user graphical reboot
|
||||
do
|
||||
mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/${runlevel}.target.wants
|
||||
ln -sf ../systemd-update-utmp-runlevel.service %{buildroot}%{_prefix}/lib/systemd/system/${runlevel}.target.wants/
|
||||
done
|
||||
|
||||
%find_lang systemd
|
||||
|
||||
%pre
|
||||
@ -1758,6 +1784,9 @@ exit 0
|
||||
%dir %{_libexecdir}/modules-load.d
|
||||
%dir %{_sysconfdir}/modules-load.d
|
||||
%{_libexecdir}/modules-load.d/sg.conf
|
||||
%if 0%{has_efi}
|
||||
%{_libexecdir}/modules-load.d/efivars.conf
|
||||
%endif
|
||||
|
||||
%dir %{_libexecdir}/tmpfiles.d
|
||||
%dir %{_sysconfdir}/tmpfiles.d
|
||||
@ -1791,6 +1820,19 @@ exit 0
|
||||
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.hostname1.conf
|
||||
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.timedate1.conf
|
||||
|
||||
# Some files which may created by us
|
||||
%dir %{_sysconfdir}/X11/xorg.conf.d
|
||||
%ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf
|
||||
%ghost %config(noreplace) %{_sysconfdir}/vconsole.conf
|
||||
%ghost %config(noreplace) %{_sysconfdir}/locale.conf
|
||||
%ghost %config(noreplace) %{_sysconfdir}/machine-id
|
||||
%ghost %config(noreplace) %{_sysconfdir}/machine-info
|
||||
%ghost %config(noreplace) %{_sysconfdir}/hostname
|
||||
%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel2.target
|
||||
%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel3.target
|
||||
%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel4.target
|
||||
%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel5.target
|
||||
|
||||
%{_datadir}/dbus-1/services/org.freedesktop.systemd1.service
|
||||
%{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service
|
||||
%{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service
|
||||
|
||||
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 12 09:40:54 UTC 2014 - werner@suse.de
|
||||
|
||||
- Add workaround for bnc#882393 by adding the systemd update utmp
|
||||
runlevel service to the wanted unit of e.g. the graphical target
|
||||
- Add some later on created files to our file list
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 12 03:33:01 UTC 2014 - jlee@suse.com
|
||||
|
||||
- Generate %{_libexecdir}/modules-load.d/efivars.conf so we load efivars
|
||||
module at boot time not from udev (bnc#881559).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 11 21:59:29 UTC 2014 - crrodriguez@opensuse.org
|
||||
|
||||
|
||||
42
systemd.spec
42
systemd.spec
@ -1311,6 +1311,12 @@ cat << EOF > %{buildroot}%{_libexecdir}/modules-load.d/sg.conf
|
||||
# load sg module at boot time
|
||||
sg
|
||||
EOF
|
||||
%if 0%{has_efi}
|
||||
cat << EOF > %{buildroot}%{_libexecdir}/modules-load.d/efivars.conf
|
||||
# load efivars module at boot time
|
||||
efivars
|
||||
EOF
|
||||
%endif
|
||||
|
||||
# To avoid making life hard for Factory developers, don't package the
|
||||
# kernel.core_pattern setting until systemd-coredump is a part of an actual
|
||||
@ -1435,6 +1441,26 @@ cat > %{buildroot}/%{_prefix}/lib/systemd/system/fix.service <<-'EOF'
|
||||
ln -sf ../fix.service %{buildroot}/%{_prefix}/lib/systemd/system/remote-fs.target.wants
|
||||
%endif
|
||||
|
||||
# Some files which may created by us or by the admin later on
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
|
||||
for ghost in X11/xorg.conf.d/00-keyboard.conf vconsole.conf locale.conf \
|
||||
machine-id machine-info hostname \
|
||||
systemd/system/runlevel2.target \
|
||||
systemd/system/runlevel3.target \
|
||||
systemd/system/runlevel4.target \
|
||||
systemd/system/runlevel4.target \
|
||||
systemd/system/runlevel5.target
|
||||
do
|
||||
> %{buildroot}%{_sysconfdir}/$ghost
|
||||
done
|
||||
|
||||
# Workaround for bug #882393
|
||||
for runlevel in poweroff rescue multi-user graphical reboot
|
||||
do
|
||||
mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/${runlevel}.target.wants
|
||||
ln -sf ../systemd-update-utmp-runlevel.service %{buildroot}%{_prefix}/lib/systemd/system/${runlevel}.target.wants/
|
||||
done
|
||||
|
||||
%find_lang systemd
|
||||
|
||||
%pre
|
||||
@ -1753,6 +1779,9 @@ exit 0
|
||||
%dir %{_libexecdir}/modules-load.d
|
||||
%dir %{_sysconfdir}/modules-load.d
|
||||
%{_libexecdir}/modules-load.d/sg.conf
|
||||
%if 0%{has_efi}
|
||||
%{_libexecdir}/modules-load.d/efivars.conf
|
||||
%endif
|
||||
|
||||
%dir %{_libexecdir}/tmpfiles.d
|
||||
%dir %{_sysconfdir}/tmpfiles.d
|
||||
@ -1786,6 +1815,19 @@ exit 0
|
||||
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.hostname1.conf
|
||||
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.timedate1.conf
|
||||
|
||||
# Some files which may created by us
|
||||
%dir %{_sysconfdir}/X11/xorg.conf.d
|
||||
%ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf
|
||||
%ghost %config(noreplace) %{_sysconfdir}/vconsole.conf
|
||||
%ghost %config(noreplace) %{_sysconfdir}/locale.conf
|
||||
%ghost %config(noreplace) %{_sysconfdir}/machine-id
|
||||
%ghost %config(noreplace) %{_sysconfdir}/machine-info
|
||||
%ghost %config(noreplace) %{_sysconfdir}/hostname
|
||||
%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel2.target
|
||||
%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel3.target
|
||||
%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel4.target
|
||||
%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel5.target
|
||||
|
||||
%{_datadir}/dbus-1/services/org.freedesktop.systemd1.service
|
||||
%{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service
|
||||
%{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service
|
||||
|
||||
Loading…
Reference in New Issue
Block a user