From: Alkis Georgopoulos <alkisg@gmail.com>
Date: Sat, 29 Nov 2014 15:51:04 +0000 (+0200)
Subject: Correctly sort kernel FLAVOR in increasing order and VERSION in decreasing.
X-Git-Tag: archive/raspbian/5.18.12-1+rpi1^2~1^2^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4445335f49671420c0c4a5ca0c44e5ccd221c05f;p=ltsp.git

Correctly sort kernel FLAVOR in increasing order and VERSION in decreasing.


Gbp-Pq: Topic upstream
Gbp-Pq: Name 0015-Correctly-sort-kernel-FLAVOR-in-increasing-order-and.patch
---

diff --git a/client/Debian/etc/ltsp/update-kernels.conf b/client/Debian/etc/ltsp/update-kernels.conf
index 2ab982a..164880e 100644
--- a/client/Debian/etc/ltsp/update-kernels.conf
+++ b/client/Debian/etc/ltsp/update-kernels.conf
@@ -28,7 +28,7 @@ CMDLINE_NBD="root=/dev/nbd0"
 CMDLINE_AOE="root=/dev/etherd/e0.0"
 
 # A sed expression that matches all kernels and returns $FILE $NAME $VERSION $FLAVOR
-# Example: ls /boot | sed -n "$KERNEL_NAMES" | sort -V -k 4,4  | sort -r -k 3,3
+# Example: ls /boot | sed -n "$KERNEL_NAMES" | sort -k 4,4V -k 3,3rV
 KERNEL_NAMES='s/\(vmlinu[xz]-\)\([^-]*-[^-]*-\)\(.*\)/& \1 \2 \3/p'
 
 # A sed expression that maps from a kernel name to an initrd name
diff --git a/client/Debian/share/ltsp/cleanup.d/50-vmlinuz b/client/Debian/share/ltsp/cleanup.d/50-vmlinuz
index 3a88d30..82fb818 100644
--- a/client/Debian/share/ltsp/cleanup.d/50-vmlinuz
+++ b/client/Debian/share/ltsp/cleanup.d/50-vmlinuz
@@ -14,7 +14,7 @@ INITRD_NAME=${INITRD_NAME:-'s/vmlinu[xz]/initrd.img/p'}
 
 read file name version flavor <<EOF
 $(find "/boot/" -mindepth 1 -maxdepth 1 -type f -printf "%f\n" |
-    sed -n "$KERNEL_NAMES" | sort -V -k 4,4  | sort -r -k 3,3)
+    sed -n "$KERNEL_NAMES" | sort -k 4,4V -k 3,3rV)
 EOF
 initrd=$(echo "$file" | sed -n "$INITRD_NAME")
 
diff --git a/client/Ubuntu/etc/ltsp/update-kernels.conf b/client/Ubuntu/etc/ltsp/update-kernels.conf
index 059cd68..6e3d2f8 100644
--- a/client/Ubuntu/etc/ltsp/update-kernels.conf
+++ b/client/Ubuntu/etc/ltsp/update-kernels.conf
@@ -28,7 +28,7 @@ CMDLINE_NBD="root=/dev/nbd0"
 CMDLINE_AOE="root=/dev/etherd/e0.0"
 
 # A sed expression that matches all kernels and returns $FILE $NAME $VERSION $FLAVOR
-# Example: ls /boot | sed -n "$KERNEL_NAMES" | sort -V -k 4,4  | sort -r -k 3,3
+# Example: ls /boot | sed -n "$KERNEL_NAMES" | sort -k 4,4V -k 3,3rV
 KERNEL_NAMES='s/\(vmlinu[xz]-\)\([^-]*-[^-]*-\)\(.*\)/& \1 \2 \3/p'
 
 # A sed expression that maps from a kernel name to an initrd name
diff --git a/client/share/ltsp/update-kernels b/client/share/ltsp/update-kernels
index 61e7eae..96310fb 100755
--- a/client/share/ltsp/update-kernels
+++ b/client/share/ltsp/update-kernels
@@ -67,7 +67,7 @@ kernel_split() {
                     ;;
             esac
         done
-    done | sed -n "$KERNEL_NAMES" | sort -V -k 4,4  | sort -r -k 3,3
+    done | sed -n "$KERNEL_NAMES" | sort -k 4,4V -k 3,3rV
 
     eval "$orig_flags"
 }
@@ -102,7 +102,7 @@ cmdline_method_default=$(eval echo '$CMDLINE_'$boot_method_default)
 BOOTPROMPT_OPTS="$CMDLINE_LINUX_DEFAULTS $cmdline_method_default"
 
 # A sed expression that matches all kernels and returns $FILE $NAME $VERSION $FLAVOR
-# Example: ls /boot | sed -n "$KERNEL_NAMES" | sort -V -k 4,4  | sort -r -k 3,3
+# Example: ls /boot | sed -n "$KERNEL_NAMES" | sort -k 4,4V -k 3,3rV
 KERNEL_NAMES=${KERNEL_NAMES:-'s/\(vmlinu[xz]-\)\([^-]*-[^-]*-\)\(.*\)/& \1 \2 \3/p'}
 
 if [ -f /usr/lib/yaboot/yaboot ]; then
diff --git a/server/ltsp-update-kernels b/server/ltsp-update-kernels
index 4a71b2b..3e08149 100755
--- a/server/ltsp-update-kernels
+++ b/server/ltsp-update-kernels
@@ -151,7 +151,7 @@ link_kernel_flavors() {
 
     last_flavor=
     find "$tftpname" -mindepth 1 -maxdepth 1 -type f -printf "%f\n" \
-    | sed -n "$KERNEL_NAMES" | sort -V -k 4,4  | sort -r -k 3,3 \
+    | sed -n "$KERNEL_NAMES" | sort -k 4,4V -k 3,3rV \
     | while read file name version flavor; do
         if [ "$flavor" != "$last_flavor" ]; then
             initrd=$(echo "$file" | sed -n "$INITRD_NAME")