Stop messing with issue files.

diff --git a/files/etc/issue.expect.new b/files/etc/issue.expect.new
deleted file mode 100644 (file)
index efc8255..0000000
--- a/files/etc/issue.expect.new
+++ /dev/null
@@ -1,2 +0,0 @@
-Debian GNU/Linux 7 \n \l
-

diff --git a/files/etc/issue.net.expect.new b/files/etc/issue.net.expect.new
deleted file mode 100644 (file)
index 3310237..0000000
--- a/files/etc/issue.net.expect.new
+++ /dev/null
@@ -1 +0,0 @@
-Debian GNU/Linux 7

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 27e03f6..127674e 100644 (file)
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -57,7 +57,6 @@ true                          dpkg-reconfigure sysv-rc
 true                           run_post_upgrade
 true                           apt_listchanges enable
 true                           debconf_priority reset
-true                           fix_issue
 true                           release_carnet_upgrade
 # i konacno, provjeri da li stvari rade
 true                           check_services postupgrade

diff --git a/src/functions.sh b/src/functions.sh
index ed78332..0ff3ca7 100644 (file)
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -1040,24 +1040,6 @@ upgrade_munin () {
   dpkg-reconfigure munin-cn
 }
 
-# try not to overwrite user modified issue files
-fix_issue () {
-  if cmp /etc/issue $cnup/files/etc/issue.expect.new >/dev/null; then
-    cp -av /etc/issue /etc/issue.$backup_ext
-    cat > /etc/issue <<EOF
-Debian GNU/Linux 6.0 (CARNet Debian 6.0) \\n \\l
-
-EOF
-  fi
-
-  if cmp /etc/issue.net $cnup/files/etc/issue.net.expect.new >/dev/null; then
-    cp -av /etc/issue.net /etc/issue.net.$backup_ext
-    cat > /etc/issue.net <<EOF
-Debian GNU/Linux 6.0 (CARNet Debian 6.0) %h
-EOF
-  fi
-}
-
 check_archives_space() {
   local available_disk_space archives_size
   available_disk_space=$(free_space /var/cache/apt/archives/)