Backport fix to /etc/rc for 2 stage updates