From 99fb6737482069170ae576e8929e57100a4958cd Mon Sep 17 00:00:00 2001 From: "Gerd v. Egidy" Date: Mon, 25 Sep 2023 21:44:03 +0200 Subject: [PATCH] Fix using findroot when /sbin/init is an absolute symlink (#340) Also add basic safeguards against bad usrmerge implementations: that would be when /sbin is a absolute symlink instead of a relative one. --- ChangeLog | 1 + airootfs/etc/initcpio/hooks/findroot | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4af54cb..0f18209 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ SystemRescue ChangeLog ------------------------------------------------------------------------------ 10.03 (YYYY-MM-DD): ------------------------------------------------------------------------------ +* Fix using findroot when /sbin/init is an absolute symlink (#340) * Added sleuthkit (Tools for raw file system inspection) (#349) * Added timeshift (snapshot-based backup solution) (#350) diff --git a/airootfs/etc/initcpio/hooks/findroot b/airootfs/etc/initcpio/hooks/findroot index 63923d4..9934ed7 100644 --- a/airootfs/etc/initcpio/hooks/findroot +++ b/airootfs/etc/initcpio/hooks/findroot @@ -45,7 +45,15 @@ run_hook() { echo "Checking for ${init} on device ${curdev} ..." if mount -r ${curdev} ${newroot} 2>/dev/null then - if test -x ${newroot}/${init} + # check if /sbin is a symlink and if it is absolute or relative + if test -L "${newroot}/sbin" && readlink "${newroot}/sbin" | grep -q "^/" + then + echo "Absolute /sbin symlink on device ${curdev}" + echo "This usrmerge layout is currently not supported by findroot." + umount ${newroot} + continue + fi + if test -x ${newroot}/${init} || test -L ${newroot}/${init} then echo "Found ${init} on device ${curdev}" rootcount=$((rootcount + 1))