X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=904082263f89cf92cff4b061a67f35a4247bf661;hb=8ca348a924a2c02487dc34ca16376d29ded5029d;hp=c5156e60ff70a0954269729b1c2272a80f772569;hpb=d3408f34d10c3b52d90b46293ec576a0a273b349;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index c5156e6..9040822 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -157,7 +157,7 @@ remove_x() {
   LC_MESSAGES=hr_HR dialog --backtitle "$title" --yesno "$msg_remove_x" 18 75
   if [ $? -eq 0 ]; then
     log "Removing X Window System"
-    pkgrm xlibs
+    pkgrm x11-common
   else
     log "Skipping X Window System removal"
   fi
@@ -603,6 +603,13 @@ upgrade () {
   pkgadd_if_installed $packages
 }
 
+# install packages introduced in this release
+install_new () {
+  if [ "$new_packages" ]; then
+    pkgadd $new_packages
+  fi
+}
+
 # funkcija utrpa ispravan sources.list
 create_sources_list () {
     local sl sl_new
@@ -1233,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() {
@@ -1369,3 +1383,12 @@ round() {
 
   echo $num
 }
+
+# make sure carnet-upgrade doesn't get upgraded until the end
+hold_carnet_upgrade() {
+  echo carnet-upgrade hold | dpkg --set-selections
+}
+
+release_carnet_upgrade() {
+  echo carnet-upgrade install | dpkg --set-selections
+}