From df3ac0421182689aed21d0d811aac0a53f9b33c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Wed, 4 Feb 2004 15:53:49 +0000 Subject: [PATCH] We don't really need a lockfile, and most likely can't create one at this point. --- etc/rc.d/encswap | 7 ++----- etc/rc.d/gbde_swap | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/etc/rc.d/encswap b/etc/rc.d/encswap index 1c81d0bd95e..1d5c6b9c6f5 100644 --- a/etc/rc.d/encswap +++ b/etc/rc.d/encswap @@ -26,11 +26,8 @@ gbde_swap_attach() esac passphrase=`dd if=/dev/random count=1 2>/dev/null | md5 -q` device="${device%.bde}" - lockfile="/var/run/${device##*/}.lock" - gbde init "${device}" -L "${lockfile}" -P "${passphrase}" || - return 1 - gbde attach "${device}" -l "${lockfile}" -p "${passphrase}" || - return 1 + gbde init "${device}" -P "${passphrase}" || return 1 + gbde attach "${device}" -p "${passphrase}" || return 1 done } diff --git a/etc/rc.d/gbde_swap b/etc/rc.d/gbde_swap index 1c81d0bd95e..1d5c6b9c6f5 100644 --- a/etc/rc.d/gbde_swap +++ b/etc/rc.d/gbde_swap @@ -26,11 +26,8 @@ gbde_swap_attach() esac passphrase=`dd if=/dev/random count=1 2>/dev/null | md5 -q` device="${device%.bde}" - lockfile="/var/run/${device##*/}.lock" - gbde init "${device}" -L "${lockfile}" -P "${passphrase}" || - return 1 - gbde attach "${device}" -l "${lockfile}" -p "${passphrase}" || - return 1 + gbde init "${device}" -P "${passphrase}" || return 1 + gbde attach "${device}" -p "${passphrase}" || return 1 done }