Bläddra i källkod

Update pve8-post-install.sh

more tweaks
tteckster 2 år sedan
förälder
incheckning
773062b743
1 ändrade filer med 17 tillägg och 16 borttagningar
  1. 17 16
      misc/pve8-post-install.sh

+ 17 - 16
misc/pve8-post-install.sh

@@ -47,37 +47,38 @@ msg_error() {
 
 
 start_routines() {
 start_routines() {
   header_info
   header_info
-  CHOICE=$(whiptail --title "PVE-ENTERPRISE" --menu "The 'pve-enterprise' repository is only available to users who have purchased a Proxmox VE subscription.\n \nDisable 'pve-enterprise' repository?" 14 58 2 \
+
+  CHOICE=$(whiptail --title "SOURCES" --menu "The package manager will use the correct sources to update and install packages on your Proxmox VE 8 server.\n \nCorrect Proxmox VE 8 sources?" 14 58 2 \
     "yes" " " \
     "yes" " " \
     "no" " " 3>&2 2>&1 1>&3)
     "no" " " 3>&2 2>&1 1>&3)
   case $CHOICE in
   case $CHOICE in
   yes)
   yes)
-    msg_info "Disabling 'pve-enterprise' repository"
-    cat <<EOF >/etc/apt/sources.list.d/pve-enterprise.list
-# deb https://enterprise.proxmox.com/debian/pve bookworm pve-enterprise
+    msg_info "Correcting Proxmox VE 8 Sources"
+    cat <<EOF >/etc/apt/sources.list
+deb http://ftp.debian.org/debian bookworm main contrib
+deb http://ftp.debian.org/debian bookworm-updates main contrib
+deb http://security.debian.org/debian-security bookworm-security main contrib
 EOF
 EOF
-    msg_ok "Disabled 'pve-enterprise' repository"
+    msg_ok "Corrected Proxmox VE 8 Sources"
     ;;
     ;;
   no)
   no)
-    msg_error "Selected no to Disabling 'pve-enterprise' repository"
+    msg_error "Selected no to Correcting Proxmox VE 8 Sources"
     ;;
     ;;
   esac
   esac
 
 
-  CHOICE=$(whiptail --title "SOURCES" --menu "The package manager will use the correct sources to update and install packages on your Proxmox VE 8 server.\n \nCorrect Proxmox VE 8 sources?" 14 58 2 \
+  CHOICE=$(whiptail --title "PVE-ENTERPRISE" --menu "The 'pve-enterprise' repository is only available to users who have purchased a Proxmox VE subscription.\n \nDisable 'pve-enterprise' repository?" 14 58 2 \
     "yes" " " \
     "yes" " " \
     "no" " " 3>&2 2>&1 1>&3)
     "no" " " 3>&2 2>&1 1>&3)
   case $CHOICE in
   case $CHOICE in
   yes)
   yes)
-    msg_info "Correcting Proxmox VE 8 Sources"
-    cat <<EOF >/etc/apt/sources.list
-deb http://ftp.debian.org/debian bookworm main contrib
-deb http://ftp.debian.org/debian bookworm-updates main contrib
-deb http://security.debian.org/debian-security bookworm-security main contrib
+    msg_info "Disabling 'pve-enterprise' repository"
+    cat <<EOF >/etc/apt/sources.list.d/pve-enterprise.list
+# deb https://enterprise.proxmox.com/debian/pve bookworm pve-enterprise
 EOF
 EOF
-    msg_ok "Corrected Proxmox VE 8 Sources"
+    msg_ok "Disabled 'pve-enterprise' repository"
     ;;
     ;;
   no)
   no)
-    msg_error "Selected no to Correcting Proxmox VE 8 Sources"
+    msg_error "Selected no to Disabling 'pve-enterprise' repository"
     ;;
     ;;
   esac
   esac
 
 
@@ -87,7 +88,7 @@ EOF
   case $CHOICE in
   case $CHOICE in
   yes)
   yes)
     msg_info "Enabling 'pve-no-subscription' repository"
     msg_info "Enabling 'pve-no-subscription' repository"
-    cat <<EOF >>/etc/apt/sources.list
+    cat <<EOF >/etc/apt/sources.list.d/pve-install-repo.list
 deb http://download.proxmox.com/debian/pve bookworm pve-no-subscription
 deb http://download.proxmox.com/debian/pve bookworm pve-no-subscription
 EOF
 EOF
     msg_ok "Enabled 'pve-no-subscription' repository"
     msg_ok "Enabled 'pve-no-subscription' repository"
@@ -120,7 +121,7 @@ EOF
   case $CHOICE in
   case $CHOICE in
   yes)
   yes)
     msg_info "Adding 'pvetest' repository and set disabled"
     msg_info "Adding 'pvetest' repository and set disabled"
-    cat <<EOF >>/etc/apt/sources.list
+    cat <<EOF >/etc/apt/sources.list.d/pve-test-repo.list
 # deb http://download.proxmox.com/debian/pve bookworm pvetest
 # deb http://download.proxmox.com/debian/pve bookworm pvetest
 EOF
 EOF
     msg_ok "Added 'pvetest' repository"
     msg_ok "Added 'pvetest' repository"