summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaximilian attems <maks@debian.org>2006-10-13 09:44:20 +0200
committermaximilian attems <maks@debian.org>2006-10-13 09:44:20 +0200
commit63f337b6a8cfa058bb2ed9fcf0de6a71f3ffb9ab (patch)
treef0192c4cea64fd73d237bfa356ceff799de7db4a
parentabb7b4e13f1fab5b6d9c4ea0682429c474931fa0 (diff)
downloadinitramfs-tools-63f337b6a8cfa058bb2ed9fcf0de6a71f3ffb9ab.tar.gz
initramfs-tools-63f337b6a8cfa058bb2ed9fcf0de6a71f3ffb9ab.zip
last minute fixes update-initramfs:
- find against the correct backup - check if initramfs _really_ exists
-rw-r--r--debian/changelog5
-rwxr-xr-xupdate-initramfs4
2 files changed, 6 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 1eaf2f9..49d07a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,7 +34,10 @@ initramfs-tools (0.83) unstable; urgency=high
* manpages: Get a banana and mark myself as author.
- -- maximilian attems <maks@sternwelten.at> Fri, 13 Oct 2006 08:12:40 +0200
+ * update-initramfs: version_exists needs not only to check for existing
+ sha1sum, but also initramfs. (closes: 382472)
+
+ -- maximilian attems <maks@sternwelten.at> Fri, 13 Oct 2006 09:38:27 +0200
initramfs-tools (0.82) unstable; urgency=high
diff --git a/update-initramfs b/update-initramfs
index 11d48be..151e47a 100755
--- a/update-initramfs
+++ b/update-initramfs
@@ -56,7 +56,7 @@ verbose()
version_exists()
{
- [ -e "${STATEDIR}/${1}" ]
+ [ -e "${STATEDIR}/${1}" ] && [ -e "${initramfs}" ]
return $?
}
@@ -93,7 +93,7 @@ backup_booted_initramfs()
# keep booted initramfs
uptime_days=$(awk '{printf "%d", $1 / 3600 / 24}' /proc/uptime)
if [ -n "$uptime_days" ]; then
- boot_initramfs=$(find "${initramfs_bak}" -mtime +${uptime_days})
+ boot_initramfs=$(find "${initramfs}.bak" -mtime +${uptime_days})
fi
if [ -n "${boot_initramfs}" ]; then
mv -f "${initramfs_bak}" "${initramfs}.bak"