summaryrefslogtreecommitdiffstats
path: root/hooks
diff options
context:
space:
mode:
Diffstat (limited to 'hooks')
-rw-r--r--hooks/filesystems6
-rw-r--r--hooks/resume2
2 files changed, 4 insertions, 4 deletions
diff --git a/hooks/filesystems b/hooks/filesystems
index ba29443..306277b 100644
--- a/hooks/filesystems
+++ b/hooks/filesystems
@@ -2,13 +2,13 @@
run_hook ()
{
msg -n ":: Loading root filesystem module..."
- if [ "x${rootfstype}" != "x" ]; then
+ if [ -n "${rootfstype}" ]; then
FSTYPE="${rootfstype}"
else
if [ ! -e "${root}" ]; then
msg "\nAttempting to create root device '${root}'"
- if [ "x${rootdelay}" != "x" ]; then
+ if [ -n "${rootdelay}" ]; then
msg -n "Waiting for devices to settle..."
/bin/sleep "${rootdelay}"
msg "done."
@@ -19,7 +19,7 @@ run_hook ()
if [ "${BLOCKNAME}" = "unknown" ]; then
FSTYPE="unknown"
echo "ERROR: Failed to parse block device name for '${root}'"
- elif [ "x${BLOCKDEVICE}" = "x" ]; then
+ elif [ -z "${BLOCKDEVICE}" ]; then
FSTYPE="unknown"
echo "ERROR: Failed to parse block device ids for '${root}'"
else
diff --git a/hooks/resume b/hooks/resume
index 4af85ea..f410051 100644
--- a/hooks/resume
+++ b/hooks/resume
@@ -16,7 +16,7 @@ run_hook ()
else
suspend2root="/proc/suspend2"
fi
- if [ -d "${suspend2root}" -a "x${resume2}" != "x" ]; then
+ if [ -d "${suspend2root}" -a -n "${resume2}" ]; then
echo ${resume2} > ${suspend2root}/resume2
echo > ${suspend2root}/do_resume
fi