diff --git a/installer/ogboot_installer.py b/installer/ogboot_installer.py index 4b2a35d..17a59a7 100755 --- a/installer/ogboot_installer.py +++ b/installer/ogboot_installer.py @@ -98,8 +98,8 @@ def check_distribution(): if VERSION.startswith(UBUNTU_OS_VERSION + "."): return logger.info(f"The ogBoot installation has been tested with full functionality on Ubuntu. {UBUNTU_OS_VERSION}") - go_on = input("Would you like to continue? [s/N]: ") - if go_on.upper() != "S": + go_on = input("Would you like to continue? [y/N]: ") + if go_on.upper() != "Y": logger.error("Leaving the installation.") exit() @@ -150,8 +150,10 @@ def get_missing_packages(): PACKAGES_TO_INSTALL = ["nano", "wget", "tree"] case "22.04": PACKAGES_TO_INSTALL = ["nfs-common", "xorriso", "genisoimage", "syslinux", "liblzma-dev", "nginx", "arp-scan", "automake", "build-essential", "btrfs-progs", "composer", "curl", "ctorrent", "debootstrap", "g++-multilib", "gawk", "gettext", "graphviz", "grub-efi-amd64-signed", "jq", "libdbi-dev", "libdbi1", "libev-dev", "libjansson-dev", "liblz4-tool", "libssl-dev", "moreutils", "netpipes", "php", "php-bcmath", "php-cli", "php-curl", "php-fpm", "php-gd", "php-json", "php-ldap", "php-mbstring", "php-mysql", "php8.1-common", "php-pear", "php-xml", "php-zip", "procps", "coreutils", "rsync", "samba", "samba-common-bin", "schroot", "shim-signed", "squashfs-tools", "subversion", "tftpd-hpa", "udpcast", "unzip", "wakeonlan", "wget", "xinetd", "jq", "moreutils", "net-tools", "isolinux", "syslinux"] + case "24.04": + PACKAGES_TO_INSTALL = ["nfs-common", "xorriso", "genisoimage", "syslinux", "liblzma-dev", "nginx", "arp-scan", "automake", "build-essential", "btrfs-progs", "composer", "curl", "ctorrent", "debootstrap", "g++-multilib", "gawk", "gettext", "graphviz", "grub-efi-amd64-signed", "jq", "libdbi-dev", "libdbi1", "libev-dev", "libjansson-dev", "liblz4-tool", "libssl-dev", "moreutils", "netpipes", "php", "php-bcmath", "php-cli", "php-curl", "php-fpm", "php-gd", "php-json", "php-ldap", "php-mbstring", "php-mysql", "php8.3-common", "php-pear", "php-xml", "php-zip", "procps", "coreutils", "rsync", "samba", "samba-common-bin", "schroot", "shim-signed", "squashfs-tools", "subversion", "tftpd-hpa", "udpcast", "unzip", "wakeonlan", "wget", "xinetd", "jq", "moreutils", "net-tools", "isolinux", "syslinux"] case _: - PACKAGES_TO_INSTALL = ["bash", "nc", "rsync"] + PACKAGES_TO_INSTALL = ["bash", "rsync"] case "suse": match OSVERSION: case "15": @@ -982,9 +984,9 @@ install_packages(Missing) logger.info("Obtaining the default network configuration.") DEFAULTDEV = get_first_network_interface_with_traffic() logger.info(f"Network interface default:[{DEFAULTDEV}]") -if getNetworkSettings() != 0: - logger.error("Error reading default network settings.") - exit(1) +#if getNetworkSettings() != 0: +# logger.error("Error reading default network settings.") +# exit(1) logger.info("Configuring package repositories.") if REMOTE == 1: