From 922d2f547a1df4e86d723e72cb0ec1d5cfc8eecd Mon Sep 17 00:00:00 2001
From: Anton Midyukov <antohami@altlinux.org>
Date: Mon, 5 Nov 2018 19:57:35 +0700
Subject: [PATCH 1/2] migration to symlink: /var/run -> ../run; /var/lock ->
 ../run/lock

see alt bug 35350
---
 .../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

diff --git a/features.in/init/rescue/image-scripts.d/50-sysvinit b/features.in/init/rescue/image-scripts.d/50-sysvinit
deleted file mode 100755
index 6be4c3bd..00000000
--- a/features.in/init/rescue/image-scripts.d/50-sysvinit
+++ /dev/null
@@ -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}
diff --git a/features.in/init/rootfs/image-scripts.d/50-sysvinit b/features.in/init/rootfs/image-scripts.d/50-sysvinit
index 390d490f..40aeb68b 100755
--- a/features.in/init/rootfs/image-scripts.d/50-sysvinit
+++ b/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}
diff --git a/sub.in/stage2/image-scripts.d/99-migrate-to-symlink b/sub.in/stage2/image-scripts.d/99-migrate-to-symlink
new file mode 100755
index 00000000..6d4638d7
--- /dev/null
+++ b/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 ||:
-- 
2.17.2