fix partitioning with uniform device names (#126).

Author: HappyBasher

linbofs/usr/bin/linbo_cmd

@@ -3,7 +3,7 @@
 # linbo_cmd: legacy command wrapper for the linbo_gui
 #
 # [email protected]
-# 20250417
+# 20250801
 # GPL v3
 #
 
@@ -24,6 +24,11 @@ usage(){
   exit 0
 }
 
+remove_args(){
+  local item
+  for item in $@; do shift; done
+}
+
 [ -z "$1" ] && usage
 
 # get command, substitute outdated commands for legacy reasons
@@ -32,8 +37,8 @@ case "$1" in
   create) cmd="create_image" ;;
   label) cmd="$1" ; options="all" ;;
   memory) cmd="mem" ;;
-  partition) cmd="partition_format" ;;
-  partition_noformat) cmd="partition" ;;
+  partition) cmd="partition_format" ; remove_args ;;
+  partition_noformat) cmd="partition" ; remove_args ;;
   sync|syncr) cmd="syncstart" ;;
   synconly) cmd="sync" ;;
   cmd|wrapper) usage ;;

linbofs/usr/bin/linbo_split_startconf

@@ -2,7 +2,7 @@
 #
 # split start.conf in machine parseable chunks
 # [email protected]
-# 20250423
+# 20250801
 #
 
 
@@ -22,6 +22,11 @@ prefix="/tmp/start.conf."
 pc=0
 oc=0
 
+# replace uniform device names with real ones
+grep ^[CcDdRr][AaEeOo][CcVvOo] /start.conf | grep /dev/ | awk '{print $3}' | sort -ur | while read item; do
+  sed -i "s|$item|$(get_real_partname "$item")|g" /start.conf
+done
+
 # split sections, remove comments
 grep ^"[\[a-zA-Z]" /start.conf | sed 's|# .*||' | awk '{$1=$1};1' | csplit -s -z -f "$prefix" - '/^\[/' '{*}'
 

linbofs/usr/bin/linbo_start

@@ -2,7 +2,7 @@
 #
 # linbo_start
 # [email protected]
-# 20250510
+# 20250801
 #
 
 
@@ -56,7 +56,7 @@ if isinteger "$1"; then
 
 # check root partition
 elif [ -b "$1" ]; then
-  [ "$(realpath "$1")" = "$(realpath "$cache")" ] && shift
+  [ "$cache" = "$1" ] && shift
   source /conf/os.$(osnr_startconf "$1") &> /dev/null || usage 1
 
 else
@@ -69,7 +69,6 @@ kernel="${kernel#/}"
 initrd="${initrd#/}"
 
 # partition or isofile
-[ -L "$root" ] && root="$(realpath "$root")"
 ext="$(tolower "${baseimage##*.}")"
 if [ "$ext" = "iso" ]; then
   bootpart="/cache/$baseimage"

linbofs/usr/share/linbo/shell_functions

@@ -1,7 +1,7 @@
 # common linbo shell functions
 #
 # [email protected]
-# 20250717
+# 20250801
 #
 
 set -o pipefail
@@ -501,6 +501,23 @@ get_partnr(){
 }
 
 
+# compute real partition name from unified partition name
+get_real_partname(){
+  local part="$1"
+  # if not a unified name do nothing
+  if [ "${part:0:9}" != "/dev/disk" ]; then
+    echo "$part"
+    return
+  fi
+  local disk="$(get_disk_from_partition "$part")"
+  local realdisk="$(realpath "$disk")"
+  case "$realdisk" in
+    /dev/mmcblk[0-9]|/dev/nvme0n[0-9]) echo "$part" | sed -e "s|$disk|$realdisk|" ;;
+    *) echo "$part" | sed -e "s|${disk}p|$realdisk|" ;;
+  esac
+}
+
+
 
 #### boot, grub & efi ####
 
@@ -608,7 +625,7 @@ create_efiboot(){
   # return if entry exists
   efibootmgr | grep ^Boot[0-9] | awk -F\* '{ print $2 }' | grep -qiw " $1" && return 0
   local label="$1"
-  local efipart="$(realpath "$2")"
+  local efipart="$2"
   local efipartnr="$(get_partnr "$efipart")"
   local efidisk="$(get_disk_from_partition "$efipart")"
   local efiloader
@@ -689,7 +706,7 @@ repair_efi(){
   echo "repair_efi $@"
   local doneflag="/tmp/.repair_efi"
   [ -e "$doneflag" ] && return 0
-  local efipart="$(realpath "$1")"
+  local efipart="$1"
   local efiout="/tmp/efiout"
   local startflag="/tmp/.start"
   local line
@@ -730,7 +747,7 @@ mk_winefiboot(){
   local partition="$1"
   local doneflag="/tmp/.mk_winefiboot.$(basename "$partition")"
   [ -e "$doneflag" ] && return 0
-  local efipart="$(realpath "$2")"
+  local efipart="$2"
   local bootloaderid="$3"
   local RC="0"
   local win_bootdir="$(ls -d /mnt/[Ee][Ff][Ii]/[Mm][Ii][Cc][Rr][Oo][Ss][Oo][Ff][Tt]/[Bb][Oo][Oo][Tt] 2> /dev/null)"
@@ -762,7 +779,7 @@ mk_winefiboot(){
 # mk_efiboot: if returns 1 a reboot via grub will be initiated, othwerwise reboot via efi directly
 # args: efipart partition grubdisk
 mk_efiboot(){
-  local efipart="$(realpath "$1")"
+  local efipart="$1"
   local partition="$2"
   local grubdisk="$3"
   local startflag="/tmp/.start"
@@ -822,7 +839,7 @@ mk_linefiboot(){
   local doneflag="/tmp/.mk_linefiboot.$(basename "$partition")"
   [ -e "$doneflag" ] && return 0
   local grubdisk="$2"
-  local efipart="$(realpath "$3")"
+  local efipart="$3"
   local bootloaderid="$4"
   local RC="0"
   mkdir -p /mnt/boot/efi
@@ -880,14 +897,14 @@ prepare_grub(){
 # args: grubdisk partition grubenv kernel initrd append efipart
 prepare_reboot(){
   echo "prepare_reboot $@"
-  local grubdisk="$(realpath "$1")"
-  local partition="$(realpath "$2")"
+  local grubdisk="$1"
+  local partition="$2"
   local grubenv="$3"
   local KERNEL="${4#/}"
   local INITRD="${5#/}"
   local APPEND="$6"
   if [ -n "$7" ]; then
-    local efipart="$(realpath "$7")"
+    local efipart="$7"
   fi
   local efiboot="false"
   remote_cache "$cache" || local localcache="yes"
@@ -958,7 +975,7 @@ mk_boot(){
   local INITRD="${3#/}"
   local APPEND="$4"
   if [ -n "$(print_efipart)" ]; then
-    local efipart="$(realpath "$(print_efipart)")"
+    local efipart="$(print_efipart)"
   fi
   local partition="$1"
   remote_cache "$cache" || local localcache="yes"