diff --git a/scripts/distro.py b/scripts/distro.py index 60c4021..046e327 100644 --- a/scripts/distro.py +++ b/scripts/distro.py @@ -135,6 +135,8 @@ def distro(iso_cfg_ext_dir, iso_link): return 'pc-tool' elif re.search(r'vba32rescue', string, re.I): return 'grub2only' + elif re.search(r'BOOT_IMAGE=rising', string, re.I): + return 'rising-av' distro = detect_iso_from_file_list(iso_link) diff --git a/scripts/grub.py b/scripts/grub.py index 0719ef5..e9518da 100644 --- a/scripts/grub.py +++ b/scripts/grub.py @@ -12,6 +12,7 @@ from . import iso from . import _7zip from . import gen from .usb import bytes2human +from . import menus def mbusb_update_grub_cfg(): @@ -105,10 +106,13 @@ def mbusb_update_grub_cfg(): def write_custom_gurb_cfg(): - from . import menus loopback_cfg_path = os.path.join(config.usb_mount, 'multibootusb', iso.iso_basename(config.image_path), 'loopback.cfg') if config.distro == 'pc-tool': menu = menus.pc_tool_config(syslinux=False, grub=True) + elif config.distro == 'rising-av': + menu = menus.rising(syslinux=False, grub=True) + + if menus: write_to_file(loopback_cfg_path, menu) diff --git a/scripts/install.py b/scripts/install.py index bea94a8..f820011 100644 --- a/scripts/install.py +++ b/scripts/install.py @@ -79,6 +79,9 @@ def install_distro(): #iso.iso_extract_full(config.image_path, usb_mount) config.status_text = "Copying ISO..." copy_iso(config.image_path, install_dir) + elif config.distro == "rising-av": + iso.iso_extract_file(config.image_path, install_dir, '*boot') + iso.iso_extract_file(config.image_path, usb_mount, '*rising') elif config.distro == 'sgrubd2': copy_iso(config.image_path, install_dir) elif config.distro == 'alt-linux': diff --git a/scripts/menus.py b/scripts/menus.py index 229fe36..dfdceac 100644 --- a/scripts/menus.py +++ b/scripts/menus.py @@ -9,6 +9,7 @@ from . import iso from . import config + def pc_tool_config(syslinux=True, grub=False): """ Menu entry for PC Tool ISO @@ -32,3 +33,16 @@ INITRD /multibootusb/grub/core.img TEXT HELP Switch to GRUB2 to select boot options. ENDTEXT\n""" + + +def rising(syslinux=True, grub=False): + """ + Menu entry for Raising Anti-virus. Only grub2 menu is required. Syslinux menu is automatically added + :param syslinux: + :param grub: + :return: + """ + if grub is True: + return """menuentry """ + iso.iso_basename(config.image_path) + """ { +linux /multibootusb/linux/boot/isolinux/vmlinuz lang=us ramdisk_size=100000 init=/etc/init apm=power-off pnpbios=off vga=0x314 nomce quiet BOOT_IMAGE=rising +initrd /multibootusb/linux/boot/isolinux/ravroot.gz\n}"""