From: Michael Prokop <mika@grml.org>
Date: Sun, 22 Apr 2007 12:02:20 +0000 (+0200)
Subject: config_distri(): make sure /usr/share/grml/desktop.jpg is removed
X-Git-Tag: 0.6.41
X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=cc29a9eaa8912af5bcf3ba00fb8a04e19e57a32d;hp=57c8a44f217a0e6fc4cdbfbcdd54108ca5602fba

config_distri(): make sure /usr/share/grml/desktop.jpg is removed
---

diff --git a/autoconfig.functions b/autoconfig.functions
index cd2e1ca..26ef566 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Klaus Knopper <knopper@knopper.net>, (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Mon Apr 16 19:32:25 CEST 2007 [mika]
+# Latest change: Son Apr 22 14:01:33 CEST 2007 [mika]
 ################################################################################
 
 # {{{ path, variables, signals, umask, zsh
@@ -2243,6 +2243,8 @@ if checkbootparam "distri"; then
   DISTRI="$(getbootparam 'distri' 2>>$DEBUG)"
   if [ -r /cdrom/desktop/"$DISTRI".jpg ] ; then
      [ -n "$BOOTDEBUG" ] && einfo "Debug: bootoption distri found and file /cdrom/desktop/$DISTRI present" && eend 0
+     # make sure the desktop.jpg file is not a symlink, so copying does not file then
+     [ -L /usr/share/grml/desktop.jpg ] && rm /usr/share/grml/desktop.jpg
      cp /cdrom/desktop/"$DISTRI".jpg /usr/share/grml/desktop.jpg
   fi
 fi
diff --git a/debian/changelog b/debian/changelog
index c1ebd70..afbc42c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-autoconfig (0.6.41) unstable; urgency=low
+
+  * config_distri(): make sure /usr/share/grml/desktop.jpg is removed
+    if it's a symlink, otherwise the copy will fail.
+
+ -- Michael Prokop <mika@grml.org>  Sun, 22 Apr 2007 14:01:42 +0200
+
 grml-autoconfig (0.6.40) unstable; urgency=low
 
   * Allow BOOT_APPEND from grml-debootstrap via cmdline