X-Git-Url: http://ftp.carnet.hr/pub/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=5ec3d817ab2d13083058e6262b8eb81165d0cf7e;hb=62570336ff4a368ae1b9de58f08d94a0da99f14c;hp=ecac67b04861bfcd459ce7767f9ad3e941deb69b;hpb=8d24fff558034de33646c2ab3a4d9954fc55c107;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index ecac67b..5ec3d81 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
@@ -1376,3 +1376,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
+}