Move /etc/network/run symlink creation in ifupdown2 tmpfiles

Olivier BLIN · Olivier BLIN · commit a70639f0084e · 2023-11-10T23:11:23.000+01:00
Like /run/network, we can remove this directory symlink from codebase.
diff --git a/debian/ifupdown2.tmpfiles b/debian/ifupdown2.tmpfiles
@@ -2,3 +2,4 @@
 
 #Type   Path              Mode  UID     GID     Age   Argument
 d       /run/network      0775  root    root    -     -
+L       /etc/network/run  -     -       -       -     /run/network
diff --git a/etc/init.d/networking b/etc/init.d/networking
@@ -128,8 +128,6 @@ ifup_hotplug () {
 ifupdown_init() {
     	# remove state file at boot
 	[ ! -e ${IFSTATE_LOCKFILE} ] && rm -f ${IFSTATE_FILE}
-	[ ! -e /etc/network/run ] && \
-		ln -sf /run/network /etc/network/run &>/dev/null
 }
 
 case "$1" in
diff --git a/ifupdown2/sbin/start-networking b/ifupdown2/sbin/start-networking
@@ -108,9 +108,6 @@ ifup_mgmt () {
 ifupdown_init() {
 	# remove state file at boot
 	[ ! -e ${IFSTATE_LOCKFILE} ] && rm -f ${IFSTATE_FILE}
-
-	[ ! -e /etc/network/run ] && \
-		ln -sf /run/network /etc/network/run &>/dev/null
 }
 
 case "$1" in

Original file line number	Diff line number	Diff line change
`@@ -2,3 +2,4 @@`
`2`	`2`
`3`	`3`	`#Type Path Mode UID GID Age Argument`
`4`	`4`	`d /run/network 0775 root root - -`
	`5`	`+L /etc/network/run - - - - /run/network`
Original file line number	Diff line number	Diff line change
`@@ -128,8 +128,6 @@ ifup_hotplug () {`
`128`	`128`	`ifupdown_init() {`
`129`	`129`	`# remove state file at boot`
`130`	`130`	`[ ! -e ${IFSTATE_LOCKFILE} ] && rm -f ${IFSTATE_FILE}`
`131`		`- [ ! -e /etc/network/run ] && \`
`132`		`- ln -sf /run/network /etc/network/run &>/dev/null`
`133`	`131`	`}`
`134`	`132`
`135`	`133`	`case "$1" in`
Original file line number	Diff line number	Diff line change
`@@ -108,9 +108,6 @@ ifup_mgmt () {`
`108`	`108`	`ifupdown_init() {`
`109`	`109`	`# remove state file at boot`
`110`	`110`	`[ ! -e ${IFSTATE_LOCKFILE} ] && rm -f ${IFSTATE_FILE}`
`111`		`-`
`112`		`- [ ! -e /etc/network/run ] && \`
`113`		`- ln -sf /run/network /etc/network/run &>/dev/null`
`114`	`111`	`}`
`115`	`112`
`116`	`113`	`case "$1" in`