diff --git a/test/units/TEST-07-PID1.user-namespace-path.sh b/test/units/TEST-07-PID1.user-namespace-path.sh index f868b0ce68..6d64a52bf8 100755 --- a/test/units/TEST-07-PID1.user-namespace-path.sh +++ b/test/units/TEST-07-PID1.user-namespace-path.sh @@ -13,8 +13,12 @@ OLD_PID=$(systemctl show oldservice -p MainPID | awk -F= '{print $2}') systemd-run --unit=newservice --property=Type=notify --property=NotifyAccess=all --property=UserNamespacePath=/proc/"$OLD_PID"/ns/user --property=PrivateNetwork=true bash -c 'systemd-notify --ready; exec sleep 3600' NEW_PID=$(systemctl show newservice -p MainPID | awk -F= '{print $2}') -assert_neq "$(lsns -p "$OLD_PID" -o NS -t net -n)" "$(lsns -p "$NEW_PID" -o NS -t net -n)" -assert_eq "$(lsns -p "$OLD_PID" -o NS -t user -n)" "$(lsns -p "$NEW_PID" -o NS -t user -n)" +OLD_NETNS="$(readlink -v /proc/"$OLD_PID"/ns/net)" +NEW_NETNS="$(readlink -v /proc/"$NEW_PID"/ns/net)" +assert_neq "$OLD_NETNS" "$NEW_NETNS" +OLD_USERNS="$(readlink -v /proc/"$OLD_PID"/ns/user)" +NEW_USERNS="$(readlink -v /proc/"$NEW_PID"/ns/user)" +assert_eq "$OLD_USERNS" "$NEW_USERNS" systemctl stop oldservice newservice @@ -25,8 +29,12 @@ OLD_PID=$(systemctl show oldservice -p MainPID | awk -F= '{print $2}') systemd-run --unit=newservice --property=Type=notify --property=NotifyAccess=all --property=UserNamespacePath=/proc/"$OLD_PID"/ns/user --property=NetworkNamespacePath=/proc/"$OLD_PID"/ns/net bash -c 'systemd-notify --ready; exec sleep 3600' NEW_PID=$(systemctl show newservice -p MainPID | awk -F= '{print $2}') -assert_eq "$(lsns -p "$OLD_PID" -o NS -t net -n)" "$(lsns -p "$NEW_PID" -o NS -t net -n)" -assert_eq "$(lsns -p "$OLD_PID" -o NS -t user -n)" "$(lsns -p "$NEW_PID" -o NS -t user -n)" +OLD_NETNS="$(readlink -v /proc/"$OLD_PID"/ns/net)" +NEW_NETNS="$(readlink -v /proc/"$NEW_PID"/ns/net)" +assert_eq "$OLD_NETNS" "$NEW_NETNS" +OLD_USERNS="$(readlink -v /proc/"$OLD_PID"/ns/user)" +NEW_USERNS="$(readlink -v /proc/"$NEW_PID"/ns/user)" +assert_eq "$OLD_USERNS" "$NEW_USERNS" systemctl stop oldservice newservice @@ -37,7 +45,11 @@ OLD_PID=$(systemctl show oldservice -p MainPID | awk -F= '{print $2}') systemd-run --unit=newservice --property=Type=notify --property=NotifyAccess=all --property=UserNamespacePath=/proc/"$OLD_PID"/ns/user --property=DelegateNamespaces=net --property=PrivateNetwork=true bash -c 'systemd-notify --ready; exec sleep 3600' NEW_PID=$(systemctl show newservice -p MainPID | awk -F= '{print $2}') -assert_neq "$(lsns -p "$OLD_PID" -o NS -t net -n)" "$(lsns -p "$NEW_PID" -o NS -t net -n)" -assert_eq "$(lsns -p "$OLD_PID" -o NS -t user -n)" "$(lsns -p "$NEW_PID" -o NS -t user -n)" +OLD_NETNS="$(readlink -v /proc/"$OLD_PID"/ns/net)" +NEW_NETNS="$(readlink -v /proc/"$NEW_PID"/ns/net)" +assert_neq "$OLD_NETNS" "$NEW_NETNS" +OLD_USERNS="$(readlink -v /proc/"$OLD_PID"/ns/user)" +NEW_USERNS="$(readlink -v /proc/"$NEW_PID"/ns/user)" +assert_eq "$OLD_USERNS" "$NEW_USERNS" systemctl stop oldservice newservice