From bf6d2fe7a8ae2f9f9153b0d6f8c0b89f7ce37dd5 Mon Sep 17 00:00:00 2001 From: Root User Date: Thu, 26 Mar 2020 00:44:55 +0000 Subject: [PATCH] Fix bug that prevented install of syslinux bootloader. Added AntiX and MX Linux distros --- README.md | 10 ++++++---- distroflash.conf | 2 ++ distroflash.lua | 13 +++++++++---- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 259828e..c321ff7 100644 --- a/README.md +++ b/README.md @@ -76,6 +76,8 @@ distroflash.lua has been seen to work with the following distributions. If anyon ## Perfect, runs live and installs from live environment + * AntiX Linux 19 + * MX Linux 19.1 * Bodhi Linux 5.0.0 * Trisquel-mini 8.0 * Linux Mint 19.3 @@ -88,16 +90,16 @@ distroflash.lua has been seen to work with the following distributions. If anyon ## Finiky, can be made to install - * Salix 14.2 - has to be told to install from harddrive, and given both the device name and path to files on disk - * Slax 9.11.0 - no automated installer, apparently can be installed from live by copying files manually - * Gentoo - no automated installer, apparently can be installed manually from live + * Salix 14.2 - has to be told to install from harddrive, and given both the device name and path to files on disk + * Slax 9.11.0 - no automated installer, apparently can be installed from live by copying files manually + * Gentoo - no automated installer, apparently can be installed manually from live + * Damn Small Linux 4.4.10 - difficult to use installer, not had a successful install from it yet, but it may work. ## Live environment only * Kali Linux 2020.1 * Clonezilla * Fatdog Linux 721 - * Damn Small Linux 4.4.10 * Puppy Linux slacko 6.3.2 - installs, but installed system doesn't seem to boot * Puppy Linux tahr 6.0.5 - installs, but installed system doesn't seem to boot * Puppy Linux xenialpup 7.5 - installs, but installed system doesn't seem to boot diff --git a/distroflash.conf b/distroflash.conf index 7c45b77..849d3c6 100644 --- a/distroflash.conf +++ b/distroflash.conf @@ -3,7 +3,9 @@ # "append" is the boot parameters. This can include the variable '$(distdir)' # which is the directory name that the distro will be installed to on disk +name="AntiX" id="antiX/vmlinuz" kernel="antiX/vmlinuz" initrd="antiX/initrd.gz" append="bdir=$(distdir)/antiX rootdelay=5 from=usb,cd,hd splasht disable=lxF xorg=safe" name="Clonezilla" id="Clonezilla-Live-Version" kernel="live/vmlinuz" initrd="live/initrd.img" append="live-media-path=/$(distdir)/live boot=live union=overlay username=user config components noswap edd=on nomodeset nodmraid noeject locales= keyboard-layouts= ocs_live_run=ocs-live-general ocs_live_extra_param= ocs_live_batch=no ip= nosplash i915.blacklist=yes radeonhd.blacklist=yes nouveau.blacklist=yes vmwgfx.enable_fbdev=1 vga=791" +name="Damn Small Linux" id="boot/isolinux/linux24" kernel="boot/isolinux/linux24" initrd="boot/isolinux/minirt24.gz" append="ramdisk_size=100000 init=/etc/init lang=us apm=power-off vga=791 knoppix_dir=/$(distdir)/KNOPPIX" name="Gentoo" id="isolinux/gentoo" kernel="isolinux/gentoo" initrd="isolinux/gentoo.xz" append="init=/linuxrc looptype=squashfs loop=/$(distdir)/image.squashfs cdroot subdir=$(distdir) console=tty1" name="Kali" id="dists/kali-last-snapshot" kernel="live/vmlinuz" initrd="live/initrd.img" append="boot=live components splash hostname=kali live-media-path=/$(distdir)/live" name="lUbuntu" id="preseed/lubuntu.seed" kernel="casper/vmlinuz" initrd="" append="file=$(distdir)/preseed/lubuntu.seed boot=casper ignore_uuid only-ubiquity initrd=$(distdir)/casper/initrd live-media-path=$(distdir)/casper" diff --git a/distroflash.lua b/distroflash.lua index 6be0c94..8cc1b09 100755 --- a/distroflash.lua +++ b/distroflash.lua @@ -255,6 +255,7 @@ end function SetupDest() local devname, devtype, removable, mounted +local from, to --diskname is the name of the parent disk for a destination. For disk destinations devname and diskname will --be the same. For partitions, for example /dev/sda1, devname=sda1 and diskname=sda @@ -288,7 +289,11 @@ local devname, devtype, removable, mounted Settings.Format=true end - filesys.copy(Settings.SyslinuxDir .."/".. Settings.SyslinuxMBR, "/dev/"..diskname) + from=Settings.SyslinuxDir .."/".. Settings.SyslinuxMBR + to="/dev/"..diskname + print("install mbr: ".. from.. " to "..to) + filesys.copy(from, to) + Settings.tmpMount=("/tmp/.usb_install_"..tostring(process.pid())) filesys.mkdir(Settings.tmpMount) Settings.MountPoint=Settings.tmpMount @@ -415,7 +420,7 @@ item=toks:next() while item ~= nil do print("Install Syslinux: "..item) -filesys.copy(Settings.SyslinuxDir..item, Settings.MountPoint.."/boot/"..item) +filesys.copy(Settings.SyslinuxDir.."/"..item, Settings.MountPoint.."/boot/"..item) item=toks:next() end end @@ -423,7 +428,7 @@ end function ActivateSyslinux() print("Activate syslinux") -str=Settings.programs["syslinux"] .. " -m --install -d /boot "..Settings.InstallDest +str=Settings.programs["syslinux"] .. " --install -d /boot "..Settings.InstallDest os.execute(str) print("Activated: "..str) end @@ -432,7 +437,7 @@ end function InitConfig() local str -Settings.Version="1.0" +Settings.Version="1.1" Settings.MountPoint="/mnt" str=string.gsub(process.getenv("PATH"), "/bin", "/share") Settings.SyslinuxDir=filesys.find("syslinux", str)