diff options
| author | maximilian attems <maks@debian.org> | 2007-04-02 22:47:52 +0200 |
|---|---|---|
| committer | maximilian attems <maks@debian.org> | 2007-04-02 22:47:52 +0200 |
| commit | e5bc704cb8be07ecdd419f3630f8ce98129615c0 (patch) | |
| tree | 990c36cb84030c520ab2f4a231d1bb0610f91378 | |
| parent | 1eaf8424e56e3f52c60420ce68efdef5301a47d8 (diff) | |
| download | initramfs-tools-e5bc704cb8be07ecdd419f3630f8ce98129615c0.tar.gz initramfs-tools-e5bc704cb8be07ecdd419f3630f8ce98129615c0.zip | |
cleanup initramfs-tools.preinst from conffile move
better test for $RESUME handling
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/initramfs-tools.preinst | 16 |
2 files changed, 6 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog index e4c7b70..509e41b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,7 +34,11 @@ initramfs-tools (0.86) experimental; urgency=low Useful if a MINKVER set is not fulfilled. (LP: #101844) Thanks Soren Hansen <sh@linux2go.dk> for patch. - -- maximilian attems <maks@debian.org> Mon, 2 Apr 2007 20:20:29 +0200 + * initramfs-tools.preinst: Test if $RESUME is nonzero, not if it exists, + fixes issue of UUID resume dev. (LP: #67932) While there remove the + conffile mv handling of 0.61. + + -- maximilian attems <maks@debian.org> Mon, 2 Apr 2007 22:43:33 +0200 initramfs-tools (0.85f) unstable; urgency=high diff --git a/debian/initramfs-tools.preinst b/debian/initramfs-tools.preinst index aa8c8ca..1379766 100644 --- a/debian/initramfs-tools.preinst +++ b/debian/initramfs-tools.preinst @@ -15,7 +15,7 @@ case "$1" in if [ -e /etc/mkinitrd/mkinitrd.conf ]; then . /etc/mkinitrd/mkinitrd.conf fi - if [ -e ${RESUME} ]; then + if [ -n "${RESUME}" ]; then echo "RESUME=${RESUME}" > /etc/initramfs-tools/conf.d/resume fi @@ -40,20 +40,6 @@ case "$1" in cp /etc/mkinitrd/DSDT /etc/initramfs-tools/DSDT.aml fi ;; - upgrade) - if [ -n "$2" ] && dpkg --compare-versions "$2" lt "0.61"; then - if [ -d /etc/initramfs-tools ]; then - echo - echo "Warning: /etc/initramfs-tools already exists." - echo " Please remove it for upgrade." - echo - exit 1 - fi - if [ -d /etc/mkinitramfs ]; then - mv /etc/mkinitramfs /etc/initramfs-tools - fi - fi - ;; esac #DEBHELPER# |