@@ -, +, @@ ../run/lock --- .../init/rescue/image-scripts.d/50-sysvinit | 16 ---------------- .../init/rootfs/image-scripts.d/50-sysvinit | 12 ------------ .../stage2/image-scripts.d/99-migrate-to-symlink | 10 ++++++++++ 3 files changed, 10 insertions(+), 28 deletions(-) delete mode 100755 features.in/init/rescue/image-scripts.d/50-sysvinit create mode 100755 sub.in/stage2/image-scripts.d/99-migrate-to-symlink --- a/features.in/init/rescue/image-scripts.d/50-sysvinit +++ a/features.in/init/rescue/image-scripts.d/50-sysvinit @@ -1,16 +0,0 @@ -#!/bin/sh - -# the part below relates to sysvinit specifically -rpm -q sysvinit || exit 0 - -# this was a bunch of dirty complaints -sed -i 's,/var/run,/run,' /{etc,lib}/tmpfiles.d/*.conf ||: - -# https://bugzilla.altlinux.org/35350 -# this FAILS: no symlinks... -#rm -rf /var/run /var/lock -# ...so just revert what's been broken in failsystem package -mkdir -p /var/run /var/lock/{serial,subsys,uucp} -chmod 0770 /var/lock/subsys -chmod 0770 /var/lock/{serial,uucp} -chgrp uucp /var/lock/{serial,uucp} --- a/features.in/init/rootfs/image-scripts.d/50-sysvinit +++ a/features.in/init/rootfs/image-scripts.d/50-sysvinit @@ -8,15 +8,3 @@ rpm -q sysvinit || exit 0 case "$GLOBAL_GROUPS" in *_nmconnect*) groupadd -r _nmconnect ||:;; esac - -# this was a bunch of dirty complaints -sed -i 's,/var/run,/run,' /{etc,lib}/tmpfiles.d/*.conf ||: - -# https://bugzilla.altlinux.org/35350 -# this FAILS: no symlinks... -#rm -rf /var/run /var/lock -# ...so just revert what's been broken in failsystem package -mkdir -p /var/run /var/lock/{serial,subsys,uucp} -chmod 0770 /var/lock/subsys -chmod 0770 /var/lock/{serial,uucp} -chgrp uucp /var/lock/{serial,uucp} --- a/sub.in/stage2/image-scripts.d/99-migrate-to-symlink +++ a/sub.in/stage2/image-scripts.d/99-migrate-to-symlink @@ -0,0 +1,10 @@ +#!/bin/sh + +cp -a /var/run/* /run/ +cp -a /var/lock/ /run/ +rm -fr /var/{run,lock} +ln -s ../run /var/run +ln -s ../run/lock /var/lock + +# this was a bunch of dirty complaints +sed -i 's,/var/run,/run,' /{etc,lib}/tmpfiles.d/*.conf ||: --