Commit Graph

311 Commits (f9df4bdce624471dc31e5f50e28fc4bd6fe1da7b)
 

Author SHA1 Message Date
Sundar f9df4bdce6 Fix for Slitaz distro detection and include Suzuki in contributor list. 6 years ago
multibootusb 0cca03339c
Merge pull request #315 from shinji-s/wifislax
Add Support for WifiSlax64-1.1-final
6 years ago
Shinji Suzuki ea8a6d0b49 Get WifiSlax64-1.1-final booting.
* Prefer 'grub.cfg' over other variants like 'grub-embedded.cfg'
* Extract the tree rooted at EFI/ as well.
* Probe .txt files other than 'thema.txt' for rewriting desktop-image:
setting.
* Add 'legacy_tweak()' method to ConfigTweakers to keep old behaviour.
* Add SalixConfigTweaker.
6 years ago
multibootusb 4fb5ef9f5e
Merge pull request #314 from shinji-s/devel
FIX/improve partition type detection.
6 years ago
shinji-s 223bcc9276 Merge branch 'devel' of https://github.com/shinji-s/multibootusb into devel 6 years ago
shinji-s 9f60b92be4 FIX/improve partition type detection. 6 years ago
multibootusb 156cc0ca6b
Merge pull request #312 from shinji-s/devel
Allow target drive specification using lower case letter.
6 years ago
Shinji Suzuki 6cbb1b791f Allow target drive specification using lower case letter. 6 years ago
multibootusb a2e16c46dd
Merge pull request #310 from shinji-s/devel
CLI enhancements
6 years ago
Shinji Suzuki 5b1f7890a9 Fix misuse of getopt.
Fix typo of an option name.
6 years ago
multibootusb fe5c7c9517
Merge pull request #311 from shinji-s/antix
Add support for AntiX 17.1
6 years ago
shinji-s 75b662d8ed Fix rewriting of image-file paths in 'theme.txt'.
* Don't strip space and tabs on the left of a line
* Don't tweak a relative path.
6 years ago
shinji-s e5296b9dfd Add support for AntiX 17.1 6 years ago
shinji-s 896b7314e6 Prevent mbusb_cli from installing over existing installation.
Support persistence size specification in mbusb_cli.
Line break adjustment to fit 80 cols.
6 years ago
multibootusb 6ba656d51b
Merge pull request #309 from shinji-s/devel
Fix bug in a ConfigTweaker method & Add CentOS 7 Installer DVD support
6 years ago
shinji-s a94572c2bc Fix a rather critical bug in 'ConfigTweaker.tweak_first_match()' that got 'param_operation' contaminated with 'param_operations_for_persistence' as the recursion progress.
Support CentOS DVD installers. (Full install DVD requires ext3 formatted usb stick because its size exceeds 4GB.)
Straighten Centos Live DVD support. (Those were recognized as 'fedora' before this fix.)
Reorgazined Twaker classes a bit.
Removed control chars and extra spaces in test inputs.
6 years ago
multibootusb fe6e475d73
Merge pull request #306 from shinji-s/adhoc_fix
Change wording of a message slightly so that a user will not
6 years ago
multibootusb da811627ec
Merge pull request #305 from shinji-s/devel
Report non-existent file references in config files in more concise
6 years ago
Shinji Suzuki 00f22c5c4e Avoid rewriting paths on a comment line.
Minor change of logged messages about path rewriting.
6 years ago
Shinji Suzuki 8ae3ee1d17 Change wording of a message slightly so that a user will not
misunderstand that the distro does not implement persistence at all.
6 years ago
Shinji Suzuki d659f83925 Report non-existent file references in config files in more concise
manner.
Fix path finding regular expression to properly catch comma-delimited
paths.
6 years ago
multibootusb 9786b866ae
Merge pull request #304 from shinji-s/devel
Log path rewriting exceptions in more concise manner.
6 years ago
Shinji Suzuki 6d0e922568 Log path rewriting exceptions in more concise manner. 6 years ago
multibootusb 27d653e213
Merge pull request #303 from shinji-s/fix_distro_detection
* Fix distro detection going out of sync after uninstalling a distro
6 years ago
Shinji Suzuki dd0d23ec68 * Fix distro detection going out of sync after uninstalling a distro
because config.distro gets overwritten during uninstallation.
* Fix missed call to update_list_box() when performing config-files-only
uninstallation, which happens because distro dir is already gone.
* Fix missed update of grub.cfg when performing config-files-only
uninstallation.
* Fix multiple calls to delete_frm_file_list() when uninstalling
'windows', 'alpine' and 'generic'.
* Fix multiple calls to update_sys_cfg_file() when uninstalling a distro.
* Escape distro name when using it within regular expressions.
* Adjust line breaking to fit 80 cols.
6 years ago
multibootusb ea809a12c9
Merge pull request #299 from shinji-s/devel
Introduce infrastructure for rewriting boot configs and refreshed
6 years ago
multibootusb 9fb937d283
Merge pull request #302 from shinji-s/adhoc_fix
Fix module name typo that gets triggered by overwriting installation of
6 years ago
Shinji Suzuki 76f26f6da6 Fix assertion error that happens because persistence
size setting is remembered even for distros that
do not support persistence.
6 years ago
Shinji Suzuki 2bb9b12403 Fix module name typo that gets triggered by overwriting installation of
distros that have some dirs relocated to the root dir.
6 years ago
Shinji Suzuki a6d3744134 Fix linux (ubuntu16.04) incompatibility.
* 7z don't understand -aoa option.
* subprocess.call() can't properly pass arguments to 7z if command is
specified by a list when shell=True.
6 years ago
Shinji Suzuki ef4d34b05d Convert 'gentoo' rewrite-code to ConfigTweaker based one.
Rename 'ParamTweaker' to 'ConfigTweaker'.

pentoo-amd64-hardened-2018.0_RC5.8_pre20180305 wants 'overlayfs' present
in boot params and 'aufs' absent in order to boot properly.
6 years ago
Shinji Suzuki 4ef4146180 Replace 'live-media=' on non-liveboot lines too. This is for compatibility
with prior implementation. (Perhaps better to have this work on liveboot
lines only like other rewritings?)

Move the test function for rewrite machinary into param_rewrite.py.

Add copyright header.
6 years ago
multibootusb 0345eab70a
Merge pull request #300 from shinji-s/check7zip_exec
Detect running 7zip on a currupted iso as well as the lack of 7z
6 years ago
Shinji Suzuki d75642ac62 Detect running 7zip on a currupted iso as well as the lack of 7z
executable.
Remove repeated call to _7zip.list_iso(iso_link)
Adjusted line breaking to fit within 80 columns.
6 years ago
Shinji Suzuki 7a18b71349 Introduce infrastructure for rewriting boot configs and refreshed
persistence support for debians.
  * Boot parameters have to be 'persistence' and 'persistence-path'
  rather than 'persistent' and 'persistent-path'.
  * Backing file must be named 'persistence' rather than 'live-rw'
  * Filesystem on the backing file must contain 'persistence.conf'.
Avoid rewriting of paths starting with '/cdrom/' or '/dev/'.
Try somedir/vmlinuz if somedir/vmlinuz.efi is unavailable.
Check availability of 'e2fsck' and 'resize2fs'.
Added data/tools/persistence.gz that has initialized ext3 file
system that contains 'persistence.conf' file.
6 years ago
multibootusb a02d207575
Merge pull request #297 from shinji-s/devel
Fix regression introduced by 8ea5932bdc.
6 years ago
multibootusb 2c43930c47
Merge pull request #296 from shinji-s/devel
When fixing a path to have /multibootusb/{distro-name} prepended, con…
6 years ago
Shinji Suzuki 03077403d2 Fix regression introduced by 8ea5932bdc.
With the change in the commit, loopback.cfg got regenerated at the
location of file determined by scanning iso tree. If no loopback.cfg was
found, it was assumed to be at the distribution root directory. In either
case, loopback.cfg was generated/overwritten at the determined location
and the file was chosen for booting.
Now, if no loopback.cfg is found, grub.cfg is sought. It is only in the
case where neither is found that loopback.cfg gets generated and used.
Therefore no config files provided by distro get overwritten.
6 years ago
Shinji Suzuki 170b8dcf58 When fixing a path to have /multibootusb/{distro-name} prepended, consider another prefix '/multibootusb/{distro-name}/boot too because some distro uses '/grub/grub.cfg' to refer to a file under boot/ directory. 6 years ago
multibootusb b52594d1cd
Merge pull request #294 from shinji-s/devel
Fix tweaking of 'initrd=...' line keyed on 'initrd' because 'initrd'
6 years ago
Shinji Suzuki fa960f1a07 Fix tweaking of 'initrd=...' parameter keyed on 'initrd' because 'initrd'
part in 'initrd.img' gets affected.
6 years ago
multibootusb c192e774e5
Merge pull request #293 from shinji-s/devel
More fixes on syslinux installation and loopback.cfg generation.
6 years ago
Shinji Suzuki fe597bf1de Fix a typo that has caused failure of installation if the distribution wants .iso file available when booting.
file when booting. My bad.
6 years ago
Shinji Suzuki a3ff878087 Remove a code that does not seem essential but can potentially hurts. 6 years ago
Shinji Suzuki 0669b962ed * Split the 'kernel ...' parameter not by ',/' but by ',' because some distro contains relative paths there and then we don't see './' there.
* Fix the last block of syslinux config file being picked up but being partially extracted (only to the end of the line rather than to the end of the block). => Took $ out of the regular expression and handles the last block separately.
* Don't use 'menu label' as a key to split a syslinux config file into blocks. Solely use 'label' as the separator for extracting menu items out of syslinux config file. If 'menu label' is also considered, then we may split halfway within a block. => Removed 'menu label' from the regular expression.
6 years ago
Shinji Suzuki a3542439f7 Previous commit fixed a runtime error but was not correct in what it does.
Avoid overwriting syslinux.cfg and extlinux.cfg.
6 years ago
multibootusb fab466aecd
Merge pull request #291 from shinji-s/devel
Fix failure of syslinux installation on the usb stick and enhance generation of loopback.cfg
6 years ago
Shinji Suzuki 8ea5932bdc Fixes/Enhancements on loopback.cfg generation.
* Be more consistent about location of 'loopback.cfg'. (Use the first
one found in the iso image.)
* Fixed failure to pick the last menu item defined in syslinux config file.
* Pick 'initrd=...' parameter in 'append ...' line and generate 'initrd
...' line.
* Keep the previous content when updating.updating
* Removed redundant open/close in write_to_file().
* Fixed error message in write_to_file()
* Reduced the number of open/close in iso2grub2().
* Avoid adding a menu item withe a given name more than once.
* Keep, within the generated file, record of the source files from which menu items were picked up.
6 years ago
Shinji Suzuki 9f28a1d756 Fix failure of "Install syslinux and copy all required files." 6 years ago
Shinji Suzuki d9290c543a Fix an excess level of indirection when processing more than one match
results.
6 years ago