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

Accepting request 142434 from home:rmilasan:branches:Base:System

Browse Source 
- Fix creation of /dev/root link.

OBS-URL: https://build.opensuse.org/request/show/142434
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=314
This commit is contained in:
Frederic Crozat 2012-11-22 14:32:12 +00:00 committed by Git OBS Bridge
parent fa79d4401d
commit c0ff6f8db9
4 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
systemd.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Nov 22 14:22:00 UTC 2012 - rmilasan@suse.com
- Fix creation of /dev/root link.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 20 18:25:49 CET 2012 - fcrozat@suse.com Tue Nov 20 18:25:49 CET 2012 - fcrozat@suse.com

32
systemd.spec
View File

@ -396,7 +396,9 @@ install -m755 -D %{S:8} $RPM_BUILD_ROOT/etc/init.d/systemd-journald
install -m755 -D %{S:1060} $RPM_BUILD_ROOT/etc/init.d/boot.udev install -m755 -D %{S:1060} $RPM_BUILD_ROOT/etc/init.d/boot.udev
ln -s systemd-udevd.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/udev.service ln -s systemd-udevd.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/udev.service
sed -ie "s|@@PREFIX@@|%{_bindir}|g" %{S:1061}
install -m755 -D %{S:1061} $RPM_BUILD_ROOT/%{_prefix}/lib/udev/write_dev_root_rule install -m755 -D %{S:1061} $RPM_BUILD_ROOT/%{_prefix}/lib/udev/write_dev_root_rule
sed -ie "s|@@PREFIX@@|%{_prefix}/lib/udev|g" %{S:1062}
install -m644 -D %{S:1062} $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/udev-root-symlink.service install -m644 -D %{S:1062} $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/udev-root-symlink.service
mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants
ln -sf ../udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants ln -sf ../udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants
@ -583,24 +585,28 @@ if test -f /proc/1/exe -a -d /proc/1/root; then
fi fi
fi fi
[ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup if [ "${YAST_IS_RUNNING}" != "instsys" ]; then
if [ -e /var/lib/no_initrd_recreation_by_suspend ]; then if [ -e /var/lib/no_initrd_recreation_by_suspend ]; then
echo "Skipping recreation of existing initial ramdisks, due" echo "Skipping recreation of existing initial ramdisks, due"
echo "to presence of /var/lib/no_initrd_recreation_by_suspend" echo "to presence of /var/lib/no_initrd_recreation_by_suspend"
elif [ -x /sbin/mkinitrd ]; then elif [ -x /sbin/mkinitrd ]; then
/sbin/mkinitrd [ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup
/sbin/mkinitrd || :
fi
fi fi
%postun -n %{udevpkgname} %postun -n %{udevpkgname}
%insserv_cleanup %insserv_cleanup
systemctl daemon-reload >/dev/null 2>&1 || : systemctl daemon-reload >/dev/null 2>&1 || :
[ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup if [ "${YAST_IS_RUNNING}" != "instsys" ]; then
if [ -e /var/lib/no_initrd_recreation_by_suspend ]; then if [ -e /var/lib/no_initrd_recreation_by_suspend ]; then
echo "Skipping recreation of existing initial ramdisks, due" echo "Skipping recreation of existing initial ramdisks, due"
echo "to presence of /var/lib/no_initrd_recreation_by_suspend" echo "to presence of /var/lib/no_initrd_recreation_by_suspend"
elif [ -x /sbin/mkinitrd ]; then elif [ -x /sbin/mkinitrd ]; then
/sbin/mkinitrd [ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup
/sbin/mkinitrd || :
fi
fi fi
%post -n lib%{udevpkgname}%{udev_major} -p /sbin/ldconfig %post -n lib%{udevpkgname}%{udev_major} -p /sbin/ldconfig
@ -615,7 +621,7 @@ fi
%endif %endif
%clean %clean
rm -rf %{buildroot} # rm -rf %{buildroot}
%files %files
%defattr(-,root,root) %defattr(-,root,root)

2
udev-root-symlink.systemd
View File

@ -6,4 +6,4 @@ DefaultDependencies=no
[Service] [Service]
Type=oneshot Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
ExecStart=/usr/lib/udev/write_dev_root_rule ExecStart=@@PREFIX@@/write_dev_root_rule

2
write_dev_root_rule
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
eval $(/sbin/udevadm info --export --export-prefix=ROOT_ --device-id-of-file=/) eval $(@@PREFIX@@/udevadm info --export --export-prefix=ROOT_ --device-id-of-file=/)
[ "$ROOT_MAJOR" -gt 0 ] || return [ "$ROOT_MAJOR" -gt 0 ] || return
mkdir -m 0755 -p /run/udev/rules.d >/dev/null 2>&1 mkdir -m 0755 -p /run/udev/rules.d >/dev/null 2>&1