From: Jon Paul Maloy <jmaloy(a)redhat.com>
Creation of a symbolic link from /sbin to /usr/sbin fails if /sbin
exists and is non-empty. This is the case on Ubuntu-23.04.
We fix this by removing /sbin before creating the link.
Signed-off-by: Jon Maloy <jmaloy(a)redhat.com>
---
v2: Move the contents of /sbin to /usr/sbin before creating the link.
Signed-off-by: Jon Maloy <jmaloy(a)redhat.com>
---
test/passt.mbuto | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/test/passt.mbuto b/test/passt.mbuto
index 90816d2..75d1260 100755
--- a/test/passt.mbuto
+++ b/test/passt.mbuto
@@ -26,6 +26,9 @@ DIRS="${DIRS} /tmp /sbin /usr/share /var/log /var/lib /etc/ssh
/run/sshd /root/.
COPIES="${COPIES} small.bin,/root/small.bin medium.bin,/root/medium.bin
big.bin,/root/big.bin"
FIXUP="${FIXUP}"'
+ mv /sbin/* /usr/sbin || :
+ rm -rf /sbin
+ ln -s /usr/sbin /sbin
cat > /sbin/dhclient-script << EOF
#!/bin/sh
LOG=/var/log/dhclient-script.log
@@ -47,7 +50,6 @@ set >> \$LOG
exit 0
EOF
chmod 755 /sbin/dhclient-script
- ln -s /sbin /usr/sbin
ln -s /bin /usr/bin
ln -s /run /var/run
:> /etc/fstab
--
2.39.2