From: Valentin Vidic <Valentin.Vidic@CARNet.hr>
Date: Wed, 26 Aug 2009 11:34:51 +0000 (+0200)
Subject: Don't overwrite user modified issue files.
X-Git-Tag: debian/5.0.3~4
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=8ca348a924a2c02487dc34ca16376d29ded5029d;p=carnet-upgrade.git

Don't overwrite user modified issue files.
---

diff --git a/files/etc/issue.expect.lenny b/files/etc/issue.expect.lenny
new file mode 100644
index 0000000..b797604
--- /dev/null
+++ b/files/etc/issue.expect.lenny
@@ -0,0 +1,2 @@
+Debian GNU/Linux 5.0 \n \l
+
diff --git a/files/etc/issue.net.expect.lenny b/files/etc/issue.net.expect.lenny
new file mode 100644
index 0000000..ac469c2
--- /dev/null
+++ b/files/etc/issue.net.expect.lenny
@@ -0,0 +1 @@
+Debian GNU/Linux 5.0
diff --git a/src/functions.sh b/src/functions.sh
index 5ec3d81..9040822 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -1240,15 +1240,22 @@ comment_force_overwrite () {
   fi
 }
 
+# try not to overwrite user modified issue files
 fix_issue () {
-  cat > /etc/issue <<EOF
+  if cmp /etc/issue $cnup/files/etc/issue.expect.lenny >/dev/null; then
+    cp -av /etc/issue /etc/issue.$backup_ext
+    cat > /etc/issue <<EOF
 Debian GNU/Linux 5.0 (CARNet Debian 5.0) \\n \\l
 
 EOF
+  fi
 
-  cat > /etc/issue.net <<EOF
+  if cmp /etc/issue.net $cnup/files/etc/issue.net.expect.lenny >/dev/null; then
+    cp -av /etc/issue.net /etc/issue.net.$backup_ext
+    cat > /etc/issue.net <<EOF
 Debian GNU/Linux 5.0 (CARNet Debian 5.0) %h
 EOF
+  fi
 }
 
 check_archives_space() {