summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaximilian attems <maks@debian.org>2005-10-26 09:05:53 +0200
committermaximilian attems <maks@debian.org>2005-10-26 09:05:53 +0200
commita62c8eadea176cc83f83cf1eeeca4aabe59e5a95 (patch)
tree7875d85a0a424aaffec5080c12c35f0373e9638b
parent2002749a483fabac4b0ee32256bd937a1d9effd6 (diff)
downloadinitramfs-tools-a62c8eadea176cc83f83cf1eeeca4aabe59e5a95.tar.gz
initramfs-tools-a62c8eadea176cc83f83cf1eeeca4aabe59e5a95.zip
fix stat usage, which is no longer available in newer busybox.
use awk instead for determinig major_minor. great patch cures a hang observed on one of my laptops. :-) patch from Adrian Bridgett <adrian@smop.co.uk>, #335801.
-rw-r--r--debian/changelog8
-rw-r--r--scripts/functions6
-rwxr-xr-xscripts/local-premount/suspend5
3 files changed, 13 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 6a608d1..b6eddfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+initramfs-tools (0.37) unstable; urgency=low
+
+ * scripts/functions, scripts/local-premount/suspend: Use of "stat"
+ which isn' any more provided by busybox (1.01-3).
+ Thanks to Adrian Bridgett <adrian@smop.co.uk> for the patch using awk.
+
+ -- maximilian attems <maks@sternwelten.at> Wed, 26 Oct 2005 08:43:36 +0200
+
initramfs-tools (0.36) unstable; urgency=low
"Sunny Autumn Release"
diff --git a/scripts/functions b/scripts/functions
index 68cfcea..8e82896 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -227,9 +227,9 @@ load_modules()
if [ -e /sys/power/resume ]; then
if [ -e "${resume}" ]; then
- major=$((0x$(stat -c%t ${resume})))
- minor=$((0x$(stat -c%T ${resume})))
- echo ${major}:${minor} >/sys/power/resume
+ major_minor=$(ls -l ${resume} | \
+ awk '{printf "0x%x:0x%x", $5, $6}')
+ echo $major_minor >/sys/power/resume
fi
fi
diff --git a/scripts/local-premount/suspend b/scripts/local-premount/suspend
index 6aab596..2e0b43f 100755
--- a/scripts/local-premount/suspend
+++ b/scripts/local-premount/suspend
@@ -24,7 +24,6 @@ if [ ! -e "${resume}" ]; then
fi
if [ -e /sys/power/resume ]; then
- major=$((0x$(stat -c%t ${resume})))
- minor=$((0x$(stat -c%T ${resume})))
- echo ${major}:${minor} >/sys/power/resume
+ major_minor=$(ls -l ${resume} | awk '{printf "0x%x:0x%x", $5, $6}')
+ echo $major_minor >/sys/power/resume
fi