Skip to content

Commit

Permalink
Supress conflict with anaconda distibution and other smaller improvem…
Browse files Browse the repository at this point in the history
…ents to grub2 config files...
  • Loading branch information
mbusb committed Apr 3, 2018
1 parent 89ca0a9 commit 39ae717
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 5 deletions.
4 changes: 2 additions & 2 deletions build_pkg
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class pkg():

with open("stdeb.cfg", "w") as f:
f.write(stdcfg)
if subprocess.call('python3.5 setup.py --command-packages=stdeb.command bdist_deb', shell=True) == 0 and \
if subprocess.call('/usr/bin/python3.5 setup.py --command-packages=stdeb.command bdist_deb', shell=True) == 0 and \
os.path.exists(os.path.join("deb_dist", "python3-multibootusb_" + self.version + "-1_all.deb")):
try:
shutil.copy2(os.path.join("deb_dist", "python3-multibootusb_" + self.version + "-1_all.deb"),
Expand Down Expand Up @@ -130,7 +130,7 @@ class pkg():
"Requires = " + require)
with open("setup.cfg", "w") as f:
f.write(setup_cfg)
if subprocess.call('python3.5 setup.py bdist_rpm', shell=True) == 0 and \
if subprocess.call('/usr/bin/python3.5 setup.py bdist_rpm', shell=True) == 0 and \
os.path.exists(os.path.join("dist", "multibootusb-" + self.version + "-1.noarch.rpm")):
if self.pkg_name == 'suse':
package = "multibootusb-" + self.version + "-1suse.noarch.rpm"
Expand Down
14 changes: 14 additions & 0 deletions data/multibootusb/grub/menus/grml.d/generic.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
for isofile in $isopath/grml*.iso; do
if [ -e "$isofile" ]; then
regexp --set=isoname "$isopath/(.*)" "$isofile"
submenu "$isoname (loopback.cfg) ->" "$isofile" {
iso_path="$2"
export iso_path
search --set=root --file "$iso_path"
loopback loop "$iso_path"
root=(loop)
configfile /boot/grub/loopback.cfg
loopback --delete loop
}
fi
done
2 changes: 0 additions & 2 deletions data/multibootusb/grub/menus/pfsense.d/generic64.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
insmod ufs2
insmod bsd
for isofile in $isopath/pfSense-*-amd64.iso; do
if [ -e "$isofile" ]; then
regexp --set=isoname "$isopath/(.*)" "$isofile"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
for isofile in $isopath/TinyCore-*.iso; do
echo $isopath
if [ -e "$isofile" ]; then
regexp --set=isoname "$isopath/(.*)" "$isofile"
submenu "$isoname ->" "$isofile" {
Expand Down

0 comments on commit 39ae717

Please sign in to comment.